summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorOndřej Surý <ondrej@sury.org>2014-05-27 16:54:58 +0200
committerOndřej Surý <ondrej@sury.org>2014-05-27 16:54:58 +0200
commit32c3fbba663e5b1da38bdd2d84b0a9a78271ddfa (patch)
tree67a05c22fdb6ad63666fb043c28701bbd6225c9f /main
parent4bbffbee21093458feadd96f93b96d4627461cff (diff)
downloadphp-32c3fbba663e5b1da38bdd2d84b0a9a78271ddfa.tar.gz
New upstream version 5.6.0~beta3+dfsgupstream/5.6.0_beta3+dfsg
Diffstat (limited to 'main')
-rw-r--r--main/SAPI.c2
-rw-r--r--main/php_version.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/main/SAPI.c b/main/SAPI.c
index 7858779a6..975dd618b 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -462,7 +462,7 @@ SAPI_API void sapi_activate(TSRMLS_D)
SG(request_info).post_entry = NULL;
SG(request_info).proto_num = 1000; /* Default to HTTP 1.0 */
SG(global_request_time) = 0;
-
+ SG(post_read) = 0;
/* It's possible to override this general case in the activate() callback, if necessary. */
if (SG(request_info).request_method && !strcmp(SG(request_info).request_method, "HEAD")) {
SG(request_info).headers_only = 1;
diff --git a/main/php_version.h b/main/php_version.h
index 55e7eede0..84bcafd3e 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 6
#define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION "beta2"
-#define PHP_VERSION "5.6.0beta2"
+#define PHP_EXTRA_VERSION "beta3"
+#define PHP_VERSION "5.6.0beta3"
#define PHP_VERSION_ID 50600