From: Michael Wallner <mike@php.net>
Date: Tue, 17 Sep 2013 08:50:49 +0000 (+0200)
Subject: Merge branch 'slim-postdata'
X-Git-Tag: php-5.6.0alpha1~211^2~11^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c15d70cbd91e3f502694a31704e959cf734d8da;p=php

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

1c15d70cbd91e3f502694a31704e959cf734d8da
diff --cc sapi/cli/php_cli_server.c
index d50cc4f8a0,5ec4143ad0..5e0f6e955a
--- 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;
  	}
  } /* }}} */