php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 05:51:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
76,691 Commits 547 Branches 1,483 Tags
29a4e710de6a73341da3d268343fdfc072ba682a
Commit Graph

69 Commits

Author SHA1 Message Date
George Wang
c892127f76 Fixed #68790 (Missing return) 2015-02-07 12:18:42 -05:00
Stanislav Malyshev
af1f867308 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset
 2015-01-31 21:48:14 -08:00
Stanislav Malyshev
2cdbd3537f use right sizeof for memset 2015-01-31 21:30:58 -08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Stanislav Malyshev
96cde1841a Revert "made lsapi_main.c compatible with PHP7/phpng ." 
This reverts commit 9fb816f45a.
Not a security-related fix.
 2014-11-22 00:38:04 -08:00
George Wang
bd3bc097b0 made lsapi_main.c compatible with PHP7/phpng . 2014-11-20 16:49:56 -05:00
George Wang
9fb816f45a made lsapi_main.c compatible with PHP7/phpng . 2014-11-20 16:49:01 -05:00
George Wang
19f3f4b155 set default response code to 200 2014-11-03 11:42:45 -05:00
George Wang
1a2ec3fc60 set default response code to 200 2014-11-03 11:42:01 -05:00
George Wang
0cc2600ec6 Fixed a bug that causes crash when environment variable is access while parsing php.ini 2014-10-03 16:42:15 -04:00
George Wang
26ff3a4c1e Fixed a bug that causes crash when environment variable is access while parsing php.ini 2014-10-03 16:41:32 -04:00
George Wang
bdac08bcdd Fine tuned the order of adding request variables. 2014-09-09 00:00:14 -04:00
George Wang
d2e1a04b10 Fine tuned the order of adding request variables. 2014-09-08 23:58:05 -04:00
George Wang
bba16dde5d Update LSAPI to 6.7, added support for 'filter_input'. 
Fixed a crash in CLI mode.
 2014-09-03 11:27:54 -04:00
George Wang
582f42b8d4 Update LSAPI to 6.7, added support for 'filter_input'. 
Fixed a crash in CLI mode.
 2014-09-03 11:24:45 -04:00
George Wang
9f721967a3 Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index. 2014-07-11 14:37:39 -04:00
George Wang
0baaf9fade Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index. 2014-07-11 14:31:59 -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
e7f36ba693 cleanup file headers. 2014-07-10 15:14:30 -04:00
George Wang
01a1c3067c Do not kill children process in pre-fork mode when parent process quit. 2014-07-10 15:14:06 -04:00
George Wang
1f46bec9ce update to LSAPI 6.6 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2014-07-10 14:46:43 -04:00
George Wang
e3df0c5f60 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
 2014-07-10 14:42:05 -04:00
George Wang
eb7bf5d30a Fixed typo in Makefile.frag 2014-07-10 12:22:56 -04:00
George Wang
a34288fa1a Fixed typo in Makefile.frag 2014-07-10 12:21:23 -04:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
George Wang
9c52d09ebc 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]
 2013-01-08 11:40:13 +08:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +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