fat                                      Mon, 23 Aug 2010 20:40:44 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=302721

Log:
- Fixed bug #52674 (FPM Status page returns inconsistent Content-Type headers).

Bug: http://bugs.php.net/52674 (Analyzed) [FPM] Status page returns 
inconsistent Content-Type headers
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_status.c
    U   php/php-src/trunk/sapi/fpm/fpm/fpm_status.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2010-08-23 19:31:16 UTC (rev 302720)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-08-23 20:40:44 UTC (rev 302721)
@@ -15,6 +15,8 @@
 - Changed the $context parameter on copy() to actually have an effect. (Kalle)
 - Fixed possible crash in mssql_fetch_batch(). (Kalle)

+- Fixed bug #52674 (FPM Status page returns inconsistent Content-Type headers).
+  (fat)
 - Fixed bug #52654 (mysqli doesn't install headers with structures it uses).
   (Andrey)
 - Fixed bug #52636 (php_mysql_fetch_hash writes long value into int).

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_status.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_status.c      2010-08-23 
19:31:16 UTC (rev 302720)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_status.c      2010-08-23 
20:40:44 UTC (rev 302721)
@@ -138,7 +138,7 @@
                "total processes:  %d\n",
                status->accepted_conn, fpm_status_pool, status->pm == 
PM_STYLE_STATIC ? "static" : "dynamic", status->idle, status->active, 
status->total);

-       spprintf(content_type, 0, "text/plain");
+       spprintf(content_type, 0, "Content-Type: text/plain");
 }
 /* }}} */

@@ -159,7 +159,7 @@
                "</table>",
                status->accepted_conn, fpm_status_pool, status->pm == 
PM_STYLE_STATIC ? "static" : "dynamic", status->idle, status->active, 
status->total);

-       spprintf(content_type, 0, "text/html");
+       spprintf(content_type, 0, "Content-Type: text/html");
 }
 /* }}} */

@@ -180,7 +180,7 @@
                "}",
                status->accepted_conn, fpm_status_pool, status->pm == 
PM_STYLE_STATIC ? "static" : "dynamic", status->idle, status->active, 
status->total);

-       spprintf(content_type, 0, "application/jsonrequest");
+       spprintf(content_type, 0, "Content-Type: application/json");
 }
 /* }}} */


Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_status.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_status.c 2010-08-23 19:31:16 UTC (rev 
302720)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_status.c 2010-08-23 20:40:44 UTC (rev 
302721)
@@ -138,7 +138,7 @@
                "total processes:  %d\n",
                status->accepted_conn, fpm_status_pool, status->pm == 
PM_STYLE_STATIC ? "static" : "dynamic", status->idle, status->active, 
status->total);

-       spprintf(content_type, 0, "text/plain");
+       spprintf(content_type, 0, "Content-Type: text/plain");
 }
 /* }}} */

@@ -159,7 +159,7 @@
                "</table>",
                status->accepted_conn, fpm_status_pool, status->pm == 
PM_STYLE_STATIC ? "static" : "dynamic", status->idle, status->active, 
status->total);

-       spprintf(content_type, 0, "text/html");
+       spprintf(content_type, 0, "Content-Type: text/html");
 }
 /* }}} */

@@ -180,7 +180,7 @@
                "}",
                status->accepted_conn, fpm_status_pool, status->pm == 
PM_STYLE_STATIC ? "static" : "dynamic", status->idle, status->active, 
status->total);

-       spprintf(content_type, 0, "application/jsonrequest");
+       spprintf(content_type, 0, "Content-Type: application/json");
 }
 /* }}} */


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to