Commit:    1c15d70cbd91e3f502694a31704e959cf734d8da
Author:    Michael Wallner <m...@php.net>         Tue, 17 Sep 2013 10:50:49 
+0200
Parents:   52ff129607a7193cccbc6bdfbf1c1e8586e8d0d2 
2438490addfbfba51e12246a74588b2382caa08a
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=1c15d70cbd91e3f502694a31704e959cf734d8da

Log:
Merge branch 'slim-postdata'

* 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.

Changed paths:
  MM  main/main.c
  MM  main/php_variables.c
  MM  sapi/cli/php_cli_server.c


Diff:
diff --cc sapi/cli/php_cli_server.c
index d50cc4f,5ec4143..5e0f6e95
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@@ -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;
        }
  } /* }}} */


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

Reply via email to