delta/php-git.git/sapi/litespeed/lsapi_main.c, branch php-5.5.6 git.php.net: repository/php-src.git Happy New Year 2013-01-01T08:37:09+00:00 Xinchen Hui laruence@php.net 2013-01-01T08:37:09+00:00 a666285bc2488b7f7362368c388e41428610ad1d 






Merge branch '5.4'
2012-10-12T17:29:37+00:00

George Wang
gwang@php.net

2012-10-12T17:29:37+00:00

1407b4a08085cc6b4b534baa2ca9eb40f8d39241

* 5.4:
  sapi/litespeed/lsapi_main.c: Fix bug #63228





* 5.4:
  sapi/litespeed/lsapi_main.c: Fix bug #63228







sapi/litespeed/lsapi_main.c: Fix bug #63228
2012-10-12T17:04:22+00:00

George Wang
gwang@php.net

2012-10-12T17:04:22+00:00

22611b8d3774cff379cc51666842ab4b8a2eaf7f

Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]





Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]







Merge branch 'PHP-5.4'
2012-09-05T15:20:42+00:00

Xinchen Hui
laruence@php.net

2012-09-05T15:20:42+00:00

63d9c1f40b52ba68186b89fdd325894a13b22ade

Conflicts:
	sapi/litespeed/lsapi_main.c





Conflicts:
	sapi/litespeed/lsapi_main.c







year++
2012-09-05T15:08:05+00:00

Xinchen Hui
laruence@php.net

2012-09-05T15:08:05+00:00

d64d9e335147173507d39c759c54320e2c20c9ed












fixed a crash in cli mode when apache_request_headers() is called
2011-12-31T18:15:06+00:00

George Wang
gwang@php.net

2011-12-31T18:15:06+00:00

3c1df3349af1ae2ce44685e93dff30502c509583












keep code to be compatible with PHP4
2011-11-16T03:58:57+00:00

George Wang
gwang@php.net

2011-11-16T03:58:57+00:00

56728f11a8416d2ee42934ba6b2854f460597530












keep PHP_5_4 in sync with PHP_5_3 branch
2011-11-16T03:44:42+00:00

George Wang
gwang@php.net

2011-11-16T03:44:42+00:00

badd6a91d4c0001223abbe80a53f551642bd43f1












MF53
2011-07-12T04:45:38+00:00

Stanislav Malyshev
stas@php.net

2011-07-12T04:45:38+00:00

3f0abb300c33d30022af2040fdbbc57adb3301fd












fix CLI mode timeout
2011-05-31T22:40:42+00:00

George Wang
gwang@php.net

2011-05-31T22:40:42+00:00

cb7f656de78fa5732795542c53fc14aeb9faa525