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

diff --git a/NEWS b/NEWS
index 83312616073915374cf433ec6847539aefeb80c7..de12f57afe2c82bd3407a118130e46f206731593 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ PHP                                                                        NEWS
   . Fixed whitespace part of bug #64874 ("json_decode handles whitespace and
     case-sensitivity incorrectly"). (Andrea Faulds)
 
+- CLI server:
+  . Implemented FR #65917 (getallheaders() is not supported by the built-in web
+    server) - also implements apache_response_headers() (Andrea Faulds)
+
 
 14 Nov 2013, PHP 5.5.6
 

diff --git a/UPGRADING b/UPGRADING
index 43e4118b21245b428a45a3a3da52d223d9d5e34d..e95ac2a05fef2f980d7fe1776f100d6deac55981 100755 (executable)
--- a/UPGRADING
+++ b/UPGRADING
@@ -85,6 +85,9 @@ PHP 5.5 UPGRADE NOTES
   configure this. The service can now use Type=notify in the systemd
   unit file. (Remi)
 
+- CLI server:
+  Now supports apache_request_headers() and apache_response_headers()
+
 ========================================
 3. Deprecated Functionality
 ========================================

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 4c78fcafec08ff819741788595213989e475101d..6c83f280024c4e27ede36d08a4a4c2f985bb17a1 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1688,8 +1688,8 @@ static void add_response_header(sapi_header_struct *h, zval *return_value TSRMLS
 
 PHP_FUNCTION(apache_response_headers) /* {{{ */
 {
-       if (ZEND_NUM_ARGS() > 0) {
-               WRONG_PARAM_COUNT;
+       if (zend_parse_parameters_none() == FAILURE) {
+               return;
        }
 
        if (!&SG(sapi_headers).headers) {

diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 1315a62b870101a051a4ba67534be5a38b6c7903..ac8530afa81152622842f82fdba2dbea247eba07 100644 (file)
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -133,6 +133,7 @@ typedef struct php_cli_server_request {
        char *query_string;
        size_t query_string_len;
        HashTable headers;
+       HashTable headers_original_case;
        char *content;
        size_t content_len;
        const char *ext;
@@ -435,6 +436,75 @@ static const char *get_mime_type(const char *ext, size_t ext_len) /* {{{ */
        return NULL;
 } /* }}} */
 
+PHP_FUNCTION(apache_request_headers) /* {{{ */
+{
+       php_cli_server_client *client;
+       HashTable *headers;
+       char *key;
+       uint key_len;
+       char **value_pointer;
+       HashPosition pos;
+
+       if (zend_parse_parameters_none() == FAILURE) {
+               return;
+       }
+
+       client = SG(server_context);
+       headers = &client->request.headers_original_case;
+
+       array_init_size(return_value, zend_hash_num_elements(headers));
+
+       zend_hash_internal_pointer_reset_ex(headers, &pos);
+       while (zend_hash_get_current_data_ex(headers, (void **)&value_pointer, &pos) == SUCCESS) {
+               zend_hash_get_current_key_ex(headers, &key, &key_len, NULL, 0, &pos);
+               add_assoc_string_ex(return_value, key, key_len, *value_pointer, 1);
+               zend_hash_move_forward_ex(headers, &pos);
+       }
+}
+/* }}} */
+
+static void add_response_header(sapi_header_struct *h, zval *return_value TSRMLS_DC) /* {{{ */
+{
+       char *s, *p;
+       int  len;
+       ALLOCA_FLAG(use_heap)
+
+       if (h->header_len > 0) {
+               p = strchr(h->header, ':');
+               len = p - h->header;
+               if (p && (len > 0)) {
+                       while (len > 0 && (h->header[len-1] == ' ' || h->header[len-1] == '\t')) {
+                               len--;
+                       }
+                       if (len) {
+                               s = do_alloca(len + 1, use_heap);
+                               memcpy(s, h->header, len);
+                               s[len] = 0;
+                               do {
+                                       p++;
+                               } while (*p == ' ' || *p == '\t');
+                               add_assoc_stringl_ex(return_value, s, len+1, p, h->header_len - (p - h->header), 1);
+                               free_alloca(s, use_heap);
+                       }
+               }
+       }
+}
+/* }}} */
+
+PHP_FUNCTION(apache_response_headers) /* {{{ */
+{
+       if (zend_parse_parameters_none() == FAILURE) {
+               return;
+       }
+
+       if (!&SG(sapi_headers).headers) {
+               RETURN_FALSE;
+       }
+       array_init(return_value);
+       zend_llist_apply_with_argument(&SG(sapi_headers).headers, (llist_apply_with_arg_func_t)add_response_header, return_value TSRMLS_CC);
+}
+/* }}} */
+
 /* {{{ cli_server module
  */
 
@@ -479,9 +549,15 @@ zend_module_entry cli_server_module_entry = {
 };
 /* }}} */
 
+ZEND_BEGIN_ARG_INFO(arginfo_no_args, 0)
+ZEND_END_ARG_INFO()
+
 const zend_function_entry server_additional_functions[] = {
        PHP_FE(cli_set_process_title,        arginfo_cli_set_process_title)
        PHP_FE(cli_get_process_title,        arginfo_cli_get_process_title)
+       PHP_FE(apache_request_headers, arginfo_no_args)
+       PHP_FE(apache_response_headers, arginfo_no_args)
+       PHP_FALIAS(getallheaders, apache_request_headers, arginfo_no_args)
        {NULL, NULL, NULL}
 };
 
@@ -1300,6 +1376,7 @@ static int php_cli_server_request_ctor(php_cli_server_request *req) /* {{{ */
        req->query_string = NULL;
        req->query_string_len = 0;
        zend_hash_init(&req->headers, 0, NULL, (void(*)(void*))char_ptr_dtor_p, 1);
+       zend_hash_init(&req->headers_original_case, 0, NULL, NULL, 1);
        req->content = NULL;
        req->content_len = 0;
        req->ext = NULL;
@@ -1325,6 +1402,7 @@ static void php_cli_server_request_dtor(php_cli_server_request *req) /* {{{ */
                pefree(req->query_string, 1);
        }
        zend_hash_destroy(&req->headers);
+       zend_hash_destroy(&req->headers_original_case);
        if (req->content) {
                pefree(req->content, 1);
        }
@@ -1569,6 +1647,7 @@ static int php_cli_server_client_read_request_on_header_value(php_http_parser *p
        {
                char *header_name = zend_str_tolower_dup(client->current_header_name, client->current_header_name_len);
                zend_hash_add(&client->request.headers, header_name, client->current_header_name_len + 1, &value, sizeof(char *), NULL);
+               zend_hash_add(&client->request.headers_original_case, client->current_header_name, client->current_header_name_len + 1, &value, sizeof(char *), NULL);
                efree(header_name);
        }
 

diff --git a/sapi/cli/tests/php_cli_server_019.phpt b/sapi/cli/tests/php_cli_server_019.phpt
new file mode 100644 (file)
index 0000000..8001f51
--- /dev/null
+++ b/sapi/cli/tests/php_cli_server_019.phpt
@@ -0,0 +1,46 @@
+--TEST--
+Implement Req #65917 (getallheaders() is not supported by the built-in web server)
+--SKIPIF--
+<?php
+include "skipif.inc";
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+php_cli_server_start(<<<'PHP'
+header('Content-Type: text/plain');
+var_dump(getallheaders());
+var_dump(apache_request_headers());
+var_dump(apache_response_headers());
+PHP
+);
+
+$opts = array(
+    'http'=>array(
+        'method'=>"GET",
+        'header'=>"Foo-Bar: bar\r\n"
+    )
+);
+
+$context = stream_context_create($opts);
+echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS, false, $context);
+?>
+--EXPECTF--
+array(2) {
+  ["Host"]=>
+  string(%s) "%s:%s"
+  ["Foo-Bar"]=>
+  string(3) "bar"
+}
+array(2) {
+  ["Host"]=>
+  string(%s) "%s:%s"
+  ["Foo-Bar"]=>
+  string(3) "bar"
+}
+array(2) {
+  ["X-Powered-By"]=>
+  string(%s) "PHP/%s"
+  ["Content-Type"]=>
+  string(10) "text/plain"
+}