Commit graph

590 commits

Author SHA1 Message Date
Rasmus Lerdorf
8208462fc1 This test depends on the default_charset setting, so set it to
UTF-8 for consistent output
2012-05-23 17:48:01 -07:00
Stanislav Malyshev
08779069e8 Merge branch 'PHP-5.4'
* PHP-5.4:
  c++ comments
  restore BC
  ws + restore BC to apache_request_headers
  fix bug #61807 - Buffer Overflow in apache_request_headers
2012-05-08 10:21:10 -07:00
Stanislav Malyshev
057f4719d3 c++ comments 2012-05-08 10:19:24 -07:00
Stanislav Malyshev
1919ec5a55 restore BC 2012-05-08 10:19:24 -07:00
Stanislav Malyshev
bd8912e47c ws + restore BC to apache_request_headers 2012-05-08 10:19:23 -07:00
Stanislav Malyshev
20364bcff9 fix bug #61807 - Buffer Overflow in apache_request_headers 2012-05-08 10:19:23 -07:00
Stanislav Malyshev
b50101764b improve fix for CVE-2012-1823 2012-05-07 12:14:57 -07:00
Stanislav Malyshev
857fc1b473 Merge branch 'PHP-5.4'
* PHP-5.4:
  improve fix for CVE-2012-1823
  Fix for CVE-2012-1823
2012-05-07 12:12:48 -07:00
Stanislav Malyshev
36587ff335 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  improve fix for CVE-2012-1823
  Fix for CVE-2012-1823
2012-05-07 12:10:36 -07:00
Stanislav Malyshev
7de4b75f74 improve fix for CVE-2012-1823 2012-05-07 12:08:36 -07:00
Rasmus Lerdorf
004941af15 Fix for CVE-2012-1823 2012-05-07 12:06:45 -07:00
David Soria Parra
d3a13c2a10 Merge branch 'PHP-5.4'
By Rasmus Lerdorf
* PHP-5.4:
  Fix for CVE-2012-1823 (cherry picked from commit 29300b1f9d)
  Fix for CVE-2012-1823
2012-05-05 17:37:35 +02:00
Rasmus Lerdorf
0556103f6a Fix for CVE-2012-1823 2012-05-04 11:58:24 -07:00
Felipe Pena
47cff264df Merge branch 'PHP-5.4'
* PHP-5.4:
  - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
2012-04-19 23:14:00 -03:00
Felipe Pena
d2798c6035 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
2012-04-19 23:13:37 -03:00
Felipe Pena
c3b0fb4fbe - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net 2012-04-19 23:12:47 -03:00
Xinchen Hui
06290cc049 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed bug #61605 (header_remove() does not remove all headers)

Conflicts:
	NEWS
2012-04-04 16:16:54 +08:00
Xinchen Hui
efd671f242 Fixed bug Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:14:28 +08:00
Xinchen Hui
896c4539df Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:01:43 +08:00
Ondřej Surý
d1fd5432e1 Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831) 2012-03-21 08:44:59 +01:00
Dmitry Stogov
106e88b3db Fixed reinitialization of SAPI callbacks after php_module_startup() 2012-02-14 13:31:23 +00:00
Dmitry Stogov
2e94124494 Fixed reinitialization of SAPI callbacks after php_module_startup() 2012-02-14 13:31:23 +00:00
Dmitry Stogov
87c038be06 Always restore PG(magic_quote_gpc) on request shutdown 2012-02-02 12:58:54 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Xinchen Hui
a391535e00 Fixed bug #60206 (possible integer overflow in content_length) 2011-11-03 07:26:09 +00:00
Xinchen Hui
d7d0d0724c Fixed bug #60206 (possible integer overflow in content_length) 2011-11-03 07:26:09 +00:00
Xinchen Hui
d4b90b4788 Fixed bug #60206 (possible integer overflow in content_length) 2011-11-03 07:26:09 +00:00
Dmitry Stogov
cea8df3af5 Fixed possible memory leak 2011-08-11 06:38:42 +00:00
Dmitry Stogov
a5d3c2972e Fixed possible memory leak 2011-08-11 06:38:42 +00:00
Dmitry Stogov
69e98c9a61 Fixed possible memory leak 2011-08-11 06:38:42 +00:00
Ilia Alshanetsky
ca739da423 Removed deadcode 2011-08-08 12:14:58 +00:00
Ilia Alshanetsky
0c1516f174 Removed deadcode 2011-08-08 12:14:58 +00:00
Rasmus Lerdorf
1c3d13e65f Good catch Coverity 2011-08-07 03:25:19 +00:00
Rasmus Lerdorf
2b874abb74 Good catch Coverity 2011-08-07 03:25:19 +00:00
Pierre Joye
9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Pierre Joye
cc1c7af037 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Felipe Pena
34ef66d7a4 - Fix crash on cgi 2011-06-23 02:28:04 +00:00
Felipe Pena
61bbd09524 - Fixed crash in fastcgi (related to zend signals changes) 2011-06-05 17:02:46 +00:00
Dmitry Stogov
068a78014f Added checks for malformated FastCGI requests (Edgar Frank) 2011-01-19 08:38:25 +00:00
Dmitry Stogov
10cfbb814f Added checks for malformated FastCGI requests (Edgar Frank) 2011-01-19 08:38:25 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +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
Dmitry Stogov
bd8f3908c4 Reverted wrong patch 2010-09-20 10:45:22 +00:00
Kalle Sommer Nielsen
210fe80bd5 Fix incompatible types, we need to use a char here for recv() 2010-09-19 19:18:30 +00:00
Pierre Joye
14e77486e0 - unused, double declared 2010-09-15 22:25:44 +00:00
Dmitry Stogov
c290767ed7 Fixed bug #46723 (FastCGI persistent connection is incredibly slow due to TCP ack delay). 2010-09-06 11:11:40 +00:00
Felipe Pena
7396657fc1 - Fixed compiler warning (missing return statement) 2010-09-01 23:21:03 +00:00