Skip to content

Commit 14994b9

Browse files
committed
1 parent 25dff23 commit 14994b9

File tree

170 files changed

+4816
-15096
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+4816
-15096
lines changed

.travis.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,15 @@ compiler:
2323
cache:
2424
- apt
2525
env:
26-
#- PHP_SRC_VERSION=5.3.29
27-
# NGINX_SRC_VERSION=1.7.12
28-
#- PHP_SRC_VERSION=5.4.45
29-
# NGINX_SRC_VERSION=1.7.12
30-
#- PHP_SRC_VERSION=5.5.38
31-
# NGINX_SRC_VERSION=1.7.12
32-
- PHP_SRC_VERSION=5.6.36
26+
- PHP_SRC_VERSION=7.0.26
27+
NGINX_SRC_VERSION=1.10.3
28+
- PHP_SRC_VERSION=7.1.12
29+
NGINX_SRC_VERSION=1.10.3
30+
- PHP_SRC_VERSION=7.2.0
3331
NGINX_SRC_VERSION=1.10.3
34-
- PHP_SRC_VERSION=5.6.36
35-
NGINX_SRC_VERSION=1.8.1
3632
install:
3733
- sudo cpanm -n Test::Nginx
3834
before_script:
39-
- ./travis/compile.sh
40-
35+
- ./travis/compiler.sh
4136
script:
42-
- ./travis/test.sh
37+
- ./travis/test.sh

ChangeLog

Lines changed: 85 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,144 +1,151 @@
1+
2018-01-06 rryqszq4 <[email protected]>
2+
* Add php impl ngx_request for replace $_SERVER, not support $_SERVER.
3+
4+
* Add php impl ngx::sleep with ngx sleep event handler.
5+
6+
* Add php impl ngx::query_args.
7+
18
2017-03-29 rryqszq4 <[email protected]>
2-
* add ngx_generator for coroutine
9+
* add ngx_generator for coroutine
310

4-
* remove directive thread_by_php
11+
* remove directive thread_by_php
512

6-
* add api ngx_php::main, ngx_php::next for coroutine
13+
* add api ngx_php::main, ngx_php::next for coroutine
714

815
2017-03-29 rryqszq4 <[email protected]>
9-
* add ngx_php_uthread is coroutine use of ucontext
16+
* add ngx_php_uthread is coroutine use of ucontext
1017

11-
* optimize use of uthread in rewrite, access and content handler
18+
* optimize use of uthread in rewrite, access and content handler
1219

13-
* zend engine not support ucontext in one zend vm
20+
* zend engine not support ucontext in one zend vm
1421

15-
* change directive content_thread_by_php to thread_by_php
22+
* change directive content_thread_by_php to thread_by_php
1623

17-
* delete ngx_location::capture
24+
* delete ngx_location::capture
1825

19-
* bumped version to 0.0.10
26+
* bumped version to 0.0.10
2027

2128
2017-02-27 rryqszq4 <[email protected]>
22-
* add ngx_php_thread and ngx_php_thread_pool
29+
* add ngx_php_thread and ngx_php_thread_pool
2330

24-
* optimize directive content_thread_by_php, content_thread_by_php_file be use to
25-
new thread pool
31+
* optimize directive content_thread_by_php, content_thread_by_php_file be use to
32+
new thread pool
2633

27-
* remove ngx_capture from content_thread_by_php
34+
* remove ngx_capture from content_thread_by_php
2835

29-
* bumped version to 0.0.9
36+
* bumped version to 0.0.9
3037

3138
2017-01-30 rryqszq4 <[email protected]>
32-
* dev code "ngx_http_php_output.h", "ngx_http_php_output.c"
39+
* dev code "ngx_http_php_output.h", "ngx_http_php_output.c"
3340

34-
* add nginx directive "log_by_php", "log_by_php_file"
41+
* add nginx directive "log_by_php", "log_by_php_file"
3542

36-
* add php api "ngx::_exit"
37-
38-
* optimize nginx request phase, rewrite, access, content, log
43+
* add php api "ngx::_exit"
44+
45+
* optimize nginx request phase, rewrite, access, content, log
3946

40-
* optimize in nginx request process, rewrite, access and content use one zend vm reuqest
47+
* optimize in nginx request process, rewrite, access and content use one zend vm reuqest
4148

42-
* bumped version to 0.0.8
43-
49+
* bumped version to 0.0.8
50+
4451
2016-11-09 rryqszq4 <[email protected]>
45-
* fixd ngx_socket_tcp receive complete
52+
* fixd ngx_socket_tcp receive complete
4653

47-
* fixd ngx_socket_tcp epoll_wait error and disable keep-alive, when client active close
54+
* fixd ngx_socket_tcp epoll_wait error and disable keep-alive, when client active close
4855

49-
* add php api "ngx_time::sleep"
56+
* add php api "ngx_time::sleep"
5057

51-
* fixed issues #14 core dump, hight concurrence used of ngx_socket_tcp
52-
After system call pthread_cancel, wait for convar_clean and execute php end
58+
* fixed issues #14 core dump, hight concurrence used of ngx_socket_tcp
59+
After system call pthread_cancel, wait for convar_clean and execute php end
5360

54-
* fixed issues #15 ngx_time::sleep can't stop in apache ab test.
61+
* fixed issues #15 ngx_time::sleep can't stop in apache ab test.
5562

56-
* fixed issues #16 ngx_socket_tcp::receive receive data backup not need to parse http header.
63+
* fixed issues #16 ngx_socket_tcp::receive receive data backup not need to parse http header.
5764

58-
* bumped copyright date to 2017.
65+
* bumped copyright date to 2017.
5966

60-
* bumped version to 0.0.7
67+
* bumped version to 0.0.7
6168

6269
2016-10-15 rryqszq4 <[email protected]>
63-
* add php api "ngx_log::error"
70+
* add php api "ngx_log::error"
6471

65-
* fixd support dns resolver
72+
* fixd support dns resolver
6673

67-
* add php api "ngx_socket_tcp::settimeout"
74+
* add php api "ngx_socket_tcp::settimeout"
6875

69-
* change pthread status joinable to detached
76+
* change pthread status joinable to detached
7077

71-
* fixd issues #10 thread deadlock
78+
* fixd issues #10 thread deadlock
7279

73-
* fixd issues #11 core dump, main thread waiting for child thread enable , but part of ctx not use.
80+
* fixd issues #11 core dump, main thread waiting for child thread enable , but part of ctx not use.
7481

75-
* bumped version to 0.0.6
82+
* bumped version to 0.0.6
7683

7784
2016-09-16 rryqszq4 <[email protected]>
78-
* dev code "ngx_http_php_stream.h", "ngx_http_php_stream.c"
79-
80-
* fixd php api "ngx_socket_tcp", "::connect, ::send, ::receive, ::close" support rediscovery
85+
* dev code "ngx_http_php_stream.h", "ngx_http_php_stream.c"
86+
87+
* fixd php api "ngx_socket_tcp", "::connect, ::send, ::receive, ::close" support rediscovery
8188

82-
* add nginx directive "content_thread_by_php", "content_thread_by_php_file"
89+
* add nginx directive "content_thread_by_php", "content_thread_by_php_file"
8390

84-
* fixd "ngx_socket_tcp::send" send pack error
91+
* fixd "ngx_socket_tcp::send" send pack error
8592

86-
* fixd server active push to client about "ngx_socket_tcp::receive"
93+
* fixd server active push to client about "ngx_socket_tcp::receive"
8794

88-
* bumped version to 0.0.5
95+
* bumped version to 0.0.5
8996

9097
2016-05-30 rryqszq4 <[email protected]>
91-
* change nginx directive "php_init_code"=>"init_by_php", "php_init_file"=>"init_by_php_file", "php_rewrite_handler"=>"rewrite_by_php_file", "php_rewrite_handler_code"=>"rewrite_by_php", "php_access_handler"=>"access_by_php_file", "php_access_handler_code"=>"access_by_php", "php_content_handler"=>"content_by_php_file", "php_content_handler_code"=>"content_by_php","php_set_code"=>"set_by_php", "php_set_run_code"=>"set_run_by_php", "php_set_file"=>"set_by_php_file", "php_set_run_file"=>"set_run_by_php_file"
98+
* change nginx directive "php_init_code"=>"init_by_php", "php_init_file"=>"init_by_php_file", "php_rewrite_handler"=>"rewrite_by_php_file", "php_rewrite_handler_code"=>"rewrite_by_php", "php_access_handler"=>"access_by_php_file", "php_access_handler_code"=>"access_by_php", "php_content_handler"=>"content_by_php_file", "php_content_handler_code"=>"content_by_php","php_set_code"=>"set_by_php", "php_set_run_code"=>"set_run_by_php", "php_set_file"=>"set_by_php_file", "php_set_run_file"=>"set_run_by_php_file"
9299

93-
* add nginx directive "content_async_by_php"
100+
* add nginx directive "content_async_by_php"
94101

95-
* add php api "ngx_location::capture_async", "ngx_location::capture_multi_async"
102+
* add php api "ngx_location::capture_async", "ngx_location::capture_multi_async"
96103

97-
* add php api "ngx_location::capture", "ngx_location::capture_multi"
104+
* add php api "ngx_location::capture", "ngx_location::capture_multi"
98105

99-
* add php api "ngx_socket_tcp", "::connect, ::send, ::receive, ::close"
106+
* add php api "ngx_socket_tcp", "::connect, ::send, ::receive, ::close"
100107

101-
* merge docker file
108+
* merge docker file
102109

103-
* bumped version to 0.0.4
110+
* bumped version to 0.0.4
104111

105112
2016-05-22 rryqszq4 <[email protected]>
106-
* append ngx_devel_kit-0.2.19 module
113+
* append ngx_devel_kit-0.2.19 module
107114

108-
* append $_SERVER['SCRIPT_NAME']
115+
* append $_SERVER['SCRIPT_NAME']
109116

110-
* add nginx directive "php_set_code", "php_set_run_code", "php_set_file", "php_set_run_file"
117+
* add nginx directive "php_set_code", "php_set_run_code", "php_set_file", "php_set_run_file"
111118

112-
* support and test framework yaf and yii-1
119+
* support and test framework yaf and yii-1
113120

114-
* bumped version to 0.0.3
115-
121+
* bumped version to 0.0.3
122+
116123
2016-05-8 rryqszq4 <[email protected]>
117-
* complie php5.3~5.6 nginx1.4~1.9
118-
119-
* fixed: error call headers_sent()
120-
121-
* support php session
122-
123-
* fixed: support php://input
124-
125-
* append $_SERVER['QUERY_STRING'], $_SERVER['CONTENT_TYPE'], $_SERVER['CONTENT_LENGTH'],$_SERVER['DOCUMENT_ROOT']
126-
127-
* fixed: core dump: buffer end '\0'
128-
129-
* bumped version to 0.0.2
124+
* complie php5.3~5.6 nginx1.4~1.9
125+
126+
* fixed: error call headers_sent()
127+
128+
* support php session
129+
130+
* fixed: support php://input
131+
132+
* append $_SERVER['QUERY_STRING'], $_SERVER['CONTENT_TYPE'], $_SERVER['CONTENT_LENGTH'],$_SERVER['DOCUMENT_ROOT']
133+
134+
* fixed: core dump: buffer end '\0'
135+
136+
* bumped version to 0.0.2
130137

131138
2016-04-11 rryqszq4 <[email protected]>
132-
* add nginx directive "php_ini_path", "php_init_code", "php_init_file", "php_rewrite_handler", "php_rewrite_handler_code", "php_access_handler", "php_access_handler_code", "php_content_handler", "php_content_handler_code"
139+
* add nginx directive "php_ini_path", "php_init_code", "php_init_file", "php_rewrite_handler", "php_rewrite_handler_code", "php_access_handler", "php_access_handler_code", "php_content_handler", "php_content_handler_code"
133140

134-
* rewrite php SAPI function or prototype ub_write, flush, register_server_variables, read_post, read_cookies, header_handler, php_ini_path_override
141+
* rewrite php SAPI function or prototype ub_write, flush, register_server_variables, read_post, read_cookies, header_handler, php_ini_path_override
135142

136-
* custom function point zend_error_cb
143+
* custom function point zend_error_cb
137144

138-
* RFC 1867 protocol file upload
145+
* RFC 1867 protocol file upload
139146

140-
* Test::Nginx for test
147+
* Test::Nginx for test
141148

142-
* test[hello, ini, $_GET, $_POST, $_SERVER, $_COOKIE, $_FILES, error]
149+
* test[hello, ini, $_GET, $_POST, $_SERVER, $_COOKIE, $_FILES, error]
143150

144-
* bumped version to 0.0.1
151+
* bumped version to 0.0.1

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2016-2017, rryqszq4 <[email protected]>
1+
Copyright (c) 2016, rryqszq4
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)