Changed http_response_code() to be able to set a response code

diff --git a/NEWS b/NEWS
index 480bc72f52e57a366d822c94dc429871e68f5a72..ae0a795ad50a4e5d9256223db66ac3c6ecff2a04 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-PHP                                                                        NEWS
+PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2011, PHP 5.4.0 Alpha 2
 - General improvements:
@@ -16,6 +16,7 @@ PHP                                                                        NEWS
   . Lowered default value for Process Manager. FR #54098. (fat)
 
 - Improved core functions:
+  . Changed http_response_code() to be able to set a response code. (Kalle)
   . Fixed crypt_blowfish handling of 8-bit characters. (Stas) (CVE-2011-2483)
   . Fixed bug#55084 (Function registered by header_register_callback is
     called only once per process). (Hannes)

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index cb749a7e00fa1a36629a2c4f6e3d763f7f842373..6af19d6d184eb214a6dad8562ed866df531074c4 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1481,7 +1481,8 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO(arginfo_headers_list, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_http_response_code, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_http_response_code, 0, 0, 0)
+       ZEND_ARG_INFO(0, response_code)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ html.c */

diff --git a/ext/standard/head.c b/ext/standard/head.c
index 2f0ad9e3f68b30136de13113cca25c5252020039..ec5ed95657479a60adf4bc0ca245d6407344c453 100644 (file)
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -280,14 +280,30 @@ PHP_FUNCTION(headers_list)
 }
 /* }}} */
 
-/* {{{ proto long http_response_code()
-   Returns the current HTTP response code */
+/* {{{ proto long http_response_code([int response_code])
+   Sets a response code, or returns the current HTTP response code */
 PHP_FUNCTION(http_response_code)
 {
-       if (zend_parse_parameters_none() == FAILURE) {
+       long response_code = 0;
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &response_code) == FAILURE) {
                return;
        }
 
+       if (response_code)
+       {
+               long old_response_code;
+
+               old_response_code = SG(sapi_headers).http_response_code;
+               SG(sapi_headers).http_response_code = response_code;
+
+               if (old_response_code) {
+                       RETURN_LONG(old_response_code);
+               }
+
+               RETURN_TRUE;
+       }
+
        if (!SG(sapi_headers).http_response_code) {
                RETURN_FALSE;
        }