]> granicus.if.org Git - php/commitdiff
Merge branch 'slim-postdata'
authorMichael Wallner <mike@php.net>
Tue, 17 Sep 2013 08:50:49 +0000 (10:50 +0200)
committerMichael Wallner <mike@php.net>
Tue, 17 Sep 2013 08:50:49 +0000 (10:50 +0200)
* slim-postdata:
  slim post data
  add NEWS entry; add simple test
  more precise condition
  make this work in vc11 too
  Use int64_t and atoll() after discussion with johannes
  ws
  Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.

1  2 
main/main.c
main/php_variables.c
sapi/cli/php_cli_server.c

diff --cc main/main.c
Simple merge
Simple merge
index d50cc4f8a0375bbb442b4c39f916f5762979c52c,5ec4143ad0999d57afb7afe9955b49a089e6b84e..5e0f6e955a7f9386d542781eacb5c577ba8b8aaf
@@@ -1723,10 -1726,9 +1723,9 @@@ static void php_cli_server_client_popul
        request_info->request_uri = client->request.request_uri;
        request_info->path_translated = client->request.path_translated;
        request_info->query_string = client->request.query_string;
-       request_info->post_data = client->request.content;
-       request_info->content_length = request_info->post_data_length = client->request.content_len;
+       request_info->content_length = client->request.content_len;
        request_info->auth_user = request_info->auth_password = request_info->auth_digest = NULL;
 -      if (SUCCESS == zend_hash_find(&client->request.headers, "Content-Type", sizeof("Content-Type"), (void**)&val)) {
 +      if (SUCCESS == zend_hash_find(&client->request.headers, "content-type", sizeof("content-type"), (void**)&val)) {
                request_info->content_type = *val;
        }
  } /* }}} */