Commit Graph

27 Commits

Author SHA1 Message Date
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
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
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08: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
d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
Stanislav Malyshev
23ad275e24 MF53 2011-07-12 04:58:55 +00:00
George Wang
0bcbaa1750 fix socket address parsing code 2011-06-08 16:51:59 +00:00
George Wang
cccba0fa4d fixed keyLen validation point 2010-12-10 22:51:08 +00:00
George Wang
22badf88b0 make STDOUT function as STDERR, in case any module call print() 2009-02-27 23:33:01 +00:00
George Wang
ffe4bd566f *** empty log message *** 2008-09-21 02:38:32 +00:00
George Wang
0f4f00e3ae disable core dump by default 2008-09-21 02:34:08 +00:00
George Wang
f091e745c9 ignore signal SIGXFSZ 2008-08-26 22:05:17 +00:00
George Wang
52604d2832 added litespeed SAPI 2008-08-05 22:37:32 +00:00