summaryrefslogtreecommitdiff
path: root/main/php_variables.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-05-23 18:47:26 +0200
committerAnatol Belski <ab@php.net>2015-05-23 18:47:26 +0200
commitd5f695ce7b095610fe028166d8e3ce9c958d8020 (patch)
treeda11f0e31c86e774534a6e6c40d7991f92c4c22b /main/php_variables.c
parente13803d15bc1e332ed133cd100edf2fe6d6866cb (diff)
parentf3cec08e65ef956785bffd918ce867bfb7dd436a (diff)
downloadphp-git-d5f695ce7b095610fe028166d8e3ce9c958d8020.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: increase the internal post data buffer
Diffstat (limited to 'main/php_variables.c')
-rw-r--r--main/php_variables.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/main/php_variables.c b/main/php_variables.c
index 6b8a1726d5..cf70c8eed5 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -312,6 +312,11 @@ static inline int add_post_vars(zval *arr, post_var_data_t *vars, zend_bool eof)
return SUCCESS;
}
+#ifdef PHP_WIN32
+#define SAPI_POST_HANDLER_BUFSIZ 16384
+#else
+# define SAPI_POST_HANDLER_BUFSIZ BUFSIZ
+#endif
SAPI_API SAPI_POST_HANDLER_FUNC(php_std_post_handler)
{
zval *arr = (zval *) arg;
@@ -322,8 +327,8 @@ SAPI_API SAPI_POST_HANDLER_FUNC(php_std_post_handler)
memset(&post_data, 0, sizeof(post_data));
while (!php_stream_eof(s)) {
- char buf[BUFSIZ] = {0};
- size_t len = php_stream_read(s, buf, BUFSIZ);
+ char buf[SAPI_POST_HANDLER_BUFSIZ] = {0};
+ size_t len = php_stream_read(s, buf, SAPI_POST_HANDLER_BUFSIZ);
if (len && len != (size_t) -1) {
smart_str_appendl(&post_data.str, buf, len);
@@ -334,7 +339,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(php_std_post_handler)
}
}
- if (len != BUFSIZ){
+ if (len != SAPI_POST_HANDLER_BUFSIZ){
break;
}
}
@@ -345,6 +350,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(php_std_post_handler)
}
}
}
+#undef SAPI_POST_HANDLER_BUFSIZ
SAPI_API SAPI_INPUT_FILTER_FUNC(php_default_input_filter)
{