MFH: Fix for bug #26548: Malformed HTTP dates in headers

diff --git a/NEWS b/NEWS
index d0d1b1c615747009911ec9e053f8f98c5f5fc8ae..fcce6f265608dc9c64cef620f6082dd9dcbbed5c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,8 +5,7 @@ PHP 4                                                                      NEWS
   (Jani)
 - Fixed header handler in NSAPI SAPI module (header->replace was ignored,
   send_default_content_type now sends value from php.ini). (Uwe Schindler)
-- Fixed bug #25916 (get_browser() -> PHP Fatal error: Nesting level
-  too deep - recursive dependency?). (Uwe Schindler)
+- Fixed bug #26548 (ext/session: Malformed HTTP dates headers). (Derick)
 - Fixed bug #26488 (Missing declaration of CRTSCTS in ext/dio/dio.c). (Jani)
 - Fixed bug #26467 (flock() does not force the "wouldblock" parameter to be 
   passed by reference). (Wez)
@@ -56,6 +55,8 @@ PHP 4                                                                      NEWS
   under *BSD platforms). (Moriyoshi)
 - Fixed bug #26003 (Make fgetcsv() binary safe). (Ilia, Moriyoshi)
 - Fixed bug #25939 (feof() not working correctly for sockets). (Wez)
+- Fixed bug #25916 (get_browser() -> PHP Fatal error: Nesting level
+  too deep - recursive dependency?). (Uwe Schindler)
 - Fixed bug #25794 (Cannot open existing hash db3 file with write" ext/dba).
   (Marcus)
 - Fixed Bug #25694 (round() and number_format() give inconsistent results).

diff --git a/ext/session/session.c b/ext/session/session.c
index 4ff76a95e603f0ea41424c1a23afd54a5d241691..46075fae220c398e2d8aeb08f62001a439906bd2 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -718,6 +718,7 @@ static void strcpy_gmt(char *ubuf, time_t *when)
        php_gmtime_r(when, &tm);
        
        n = sprintf(buf, "%s, %d %s %d %02d:%02d:%02d GMT", /* SAFE */
+       n = sprintf(buf, "%s, %02d %s %d %02d:%02d:%02d GMT", /* SAFE */
                                week_days[tm.tm_wday], tm.tm_mday, 
                                month_names[tm.tm_mon], tm.tm_year + 1900, 
                                tm.tm_hour, tm.tm_min,