com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS main/SAPI.c
| From: | Adam Harvey | Date: | Fri, 13 Jun 2014 00:40:51 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS main/SAPI.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78860@lists.php.net to get a copy of this message | ||
Commit: 82231b5d895b67652c14ecb0ffddc8239777c175
Author: Adam Harvey <aharvey@php.net> Thu, 12 Jun 2014 17:40:51 -0700
Parents: af26a28ac0d217b2d30409373dd54e070566b173 aa3a5f7681060b9fe7839479d4b4355ccaa10e5e
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=82231b5d895b67652c14ecb0ffddc8239777c175
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Keep 308-399 HTTP response codes when header('Location:') is called.
Changed paths:
MM NEWS
MM main/SAPI.c
Diff:
diff --cc NEWS
index 6e176a0,6d7a7e6..bd82cae
--- a/NEWS
+++ b/NEWS
@@@ -9,9 -14,19 +9,11 @@@ PH
(static::) in some cases). (Levi Morrison)
. Fixed bug #67390 (insecure temporary file use in the configure script).
(Remi) (CVE-2014-3981)
- . Fixed bug #67399 (putenv with empty variable may lead to crash). (Stas)
-
-- CLI server:
- . Fixed Bug #67406i (built-in web-server segfaults on startup). (Remi)
-
-- Date:
- . Fixed bug #67308 (Serialize of DateTime truncates fractions of second).
- (Adam)
- . Fixed regression in fix for bug #67118 (constructor can't be called twice).
- (Remi)
+ . Fixed bug #67392 (dtrace breaks argument unpack). (Nikita)
++ . Fixed bug #67428 (header('Location: foo') will override a 308-399 response
++ code). (Adam)
- Fileinfo:
- . Fixed bug #67326 (fileinfo: cdf_read_short_sector insufficient boundary check).
. Fixed bug #67410 (fileinfo: mconvert incorrect handling of truncated pascal
string size). (Francisco Alonso, Jan Kaluza, Remi)
. Fixed bug #67411 (fileinfo: cdf_check_stream_offset insufficient boundary