George Wang
5b08e56eca
Fixed a bug that causes crash when environment variable is access while parsing php.ini
2014-10-03 16:42:27 -04:00
George Wang
4bdd9aabdd
Fine tuned the order of adding request variables.
2014-09-09 00:01:03 -04:00
George Wang
b85b78db4f
Update LSAPI to 6.7, added support for 'filter_input'.
...
Fixed a crash in CLI mode.
2014-09-03 11:29:44 -04:00
George Wang
ca8c94c917
fixed broken merged code
2014-07-11 14:57:55 -04:00
George Wang
84373a69dc
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-07-11 14:40:54 -04:00
George Wang
79d8be35f9
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
2014-07-11 14:38:18 -04:00
Anatol Belski
fbc21af87b
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
Conflicts:
sapi/litespeed/lsapilib.h
2014-07-10 22:15:52 +02:00
Anatol Belski
552cfcc578
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
force ext_dep.js prepend to configure.js in phpize mode
cleanup file headers.
Do not kill children process in pre-fork mode when parent process quit.
update to LSAPI 6.6
Update LiteSpeed SAPI code to V6.4
cleanup file headers.
Do not kill children process in pre-fork mode when parent process quit.
update to LSAPI 6.6
Update LiteSpeed SAPI code to V6.4
Conflicts:
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapilib.c
2014-07-10 22:03:45 +02:00
George Wang
7f41a34c23
cleanup file headers.
2014-07-10 15:53:47 -04:00
George Wang
ad7eae7512
Do not kill children process in pre-fork mode when parent process quit.
2014-07-10 15:53:20 -04:00
George Wang
f0b7db6c4e
update to LSAPI 6.6
...
Conflicts:
sapi/litespeed/lsapi_main.c
2014-07-10 15:52:45 -04:00
George Wang
40d11cc822
cleanup file headers.
2014-07-10 15:34:09 -04:00
George Wang
caceba5973
Do not kill children process in pre-fork mode when parent process quit.
2014-07-10 15:33:48 -04:00
George Wang
ee0c8f8d6f
update to LSAPI 6.6
...
Conflicts:
sapi/litespeed/lsapi_main.c
2014-07-10 15:33:14 -04:00
George Wang
0285720570
Update LiteSpeed SAPI code to V6.4
...
Conflicts:
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapidef.h
sapi/litespeed/lsapilib.c
sapi/litespeed/lsapilib.h
Conflicts:
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapilib.c
sapi/litespeed/lsapilib.h
2014-07-10 15:32:51 -04:00
George Wang
72e14bfb40
update year & copyright
2014-07-10 14:14:11 -04:00
George Wang
eb7bf5d30a
Fixed typo in Makefile.frag
2014-07-10 12:22:56 -04:00
George Wang
742f4704a9
sapi/litespeed/lsapi_main.c: Fix bug #63228
...
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
2014-04-22 10:48:14 -03:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
George Wang
01bc13212e
Update LiteSpeed SAPI code to V6.4
2013-11-05 16:14:49 -05:00
George Wang
3720fd77b5
Fixed typo in Makefile.frag
2013-11-05 16:12:24 -05:00
Veres Lajos
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
George Wang
1407b4a080
Merge branch '5.4'
...
* 5.4:
sapi/litespeed/lsapi_main.c: Fix bug #63228
2012-10-12 13:29:37 -04:00
George Wang
68e528a6bc
Merge branch '5.3' into 5.4
...
* 5.3:
sapi/litespeed/lsapi_main.c: Fix bug #63228
2012-10-12 13:09:53 -04:00
George Wang
22611b8d37
sapi/litespeed/lsapi_main.c: Fix bug #63228
...
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
2012-10-12 13:04:22 -04:00
Xinchen Hui
63d9c1f40b
Merge branch 'PHP-5.4'
...
Conflicts:
sapi/litespeed/lsapi_main.c
2012-09-05 23:20:42 +08:00
Xinchen Hui
9d44ff640c
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/interbase/interbase.rc
2012-09-05 23:11:19 +08:00
Xinchen Hui
d64d9e3351
year++
2012-09-05 23:08:05 +08:00
George Wang
f9d84f4f6b
fixed a crash in cli mode when apache_request_headers() is called
2011-12-31 18:15:22 +00:00
George Wang
3c1df3349a
fixed a crash in cli mode when apache_request_headers() is called
2011-12-31 18:15:06 +00:00
George Wang
25ccd72217
keep code to be compatible with PHP4
2011-11-16 04:00:28 +00:00
George Wang
56728f11a8
keep code to be compatible with PHP4
2011-11-16 03:58:57 +00:00
George Wang
dfd357db55
keep PHP_5_4 in sync with PHP_5_3 branch
2011-11-16 03:46:54 +00:00
George Wang
badd6a91d4
keep PHP_5_4 in sync with PHP_5_3 branch
2011-11-16 03:44:42 +00:00
Adam Harvey
f11500df0c
Fix bug #55769 (Make Fails with "Missing Separator" error) via s/ /^I/.
2011-09-24 19:16:33 +00:00
Adam Harvey
f75c7302cb
Fix bug #55769 (Make Fails with "Missing Separator" error) via s/ /^I/.
2011-09-24 19:16:33 +00:00
Stanislav Malyshev
23ad275e24
MF53
2011-07-12 04:58:55 +00:00
Stanislav Malyshev
4a5959d113
MF53
2011-07-12 04:58:55 +00:00
Stanislav Malyshev
3f0abb300c
MF53
2011-07-12 04:45:38 +00:00
Stanislav Malyshev
46407e6f5e
MF53
2011-07-12 04:45:38 +00:00
George Wang
0bcbaa1750
fix socket address parsing code
2011-06-08 16:51:59 +00:00
George Wang
cb7f656de7
fix CLI mode timeout
2011-05-31 22:40:42 +00:00
Pierrick Charron
1368364469
Fix common typos in the source code (Reported in Bug #54065 )
...
# External libraries were excluded
# Thanks eitan at eitanadler dot com for the first patch :)
2011-04-03 21:46:52 +00:00
Pierrick Charron
e8486cc374
Fix common typos in the source code (Reported in Bug #54065 )
...
# External libraries were excluded
# Thanks eitan at eitanadler dot com for the first patch :)
2011-04-03 21:46:52 +00:00
George Wang
cccba0fa4d
fixed keyLen validation point
2010-12-10 22:51:08 +00:00
Jani Taskinen
25aee9cad9
- Implemented FR #53271 , FR #52410 (Building multiple PHP binary SAPIs and one SAPI module the same time)
...
# Bug #53271 , Bug #52410
2010-11-13 23:13:07 +00:00
Kalle Sommer Nielsen
34b631f679
Pass the TSRMS pointers to sapi_module_struct.log_message, this saves some TSRMLS_FETCH() calls in a few of our SAPI's
2010-08-18 13:34:40 +00:00
George Wang
6106c44c10
applied patch from bug report 51452
2010-07-07 20:03:04 +00:00
