Commit graph

460 commits

Author SHA1 Message Date
Bob Weinand
fc444fbc70 Shut up, my lovely compiler; I do not like your warnings
Conflicts:
	Zend/zend_object_handlers.c
2015-02-09 11:23:35 +08:00
Xinchen Hui
8c2d91761a Also Fixed #68571 in CGI SAPI, and some cleanup 2015-01-27 22:11:23 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Stanislav Malyshev
71c970077d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  FIx bug #68618 (out of bounds read crashes php-cgi)
2014-12-30 01:26:00 -08:00
Stanislav Malyshev
f9ad308669 FIx bug #68618 (out of bounds read crashes php-cgi) 2014-12-30 01:23:05 -08:00
Anatol Belski
cb6dea6ea8 fix possible null pointer math 2014-12-01 14:40:35 +01: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
Andrea Faulds
aee271ec0d Implemented FR #65917 (getallheaders() is not supported by the built-in...)
- Implemented apache_request_headers() and getallheaders() alias in CLI server
- Implemented apache_response_headers() in CLI server using FastCGI code

Conflicts:
	NEWS
	UPGRADING
2013-11-12 20:27:34 +00:00
Arnaud Le Blanc
18f45c535b Added PHP_FCGI_BACKLOG, overrides the default listen backlog 2013-06-29 17:52:04 +02:00
Stanislav Malyshev
c877fcf6ec Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Added HTTP codes as of RFC 6585
2013-02-17 01:20:14 -08:00
Jonh Wendell
59b016192d Added HTTP codes as of RFC 6585
Added descriptions for the new HTTP codes:

- 428 Precondition Required
- 429 Too Many Requests
- 431 Request Header Fields Too Large
- 511 Network Authentication Required
2013-02-17 01:18:40 -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
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
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
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
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00