From: Michael Wallner <mike@php.net>
Date: Fri, 10 Jul 2015 07:50:12 +0000 (+0200)
Subject: Fix VC11 build
X-Git-Tag: RELEASE_2_5_1~9
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=b4c674173c6a1e8414f7c4ec3a920322cb04354a;p=m6w6%2Fext-http

Fix VC11 build
---

diff --git a/package.xml b/package.xml
index d0c1176..875d8ec 100644
--- a/package.xml
+++ b/package.xml
@@ -37,18 +37,16 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
  </lead>
  <date>2015-07-09</date>
  <version>
-  <release>2.5.0</release>
+  <release>2.5.1dev</release>
   <api>2.5.0</api>
  </version>
  <stability>
-  <release>stable</release>
+  <release>beta</release>
   <api>stable</api>
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-+ Added RFC5988 (Web Linking) support to http\Params
-+ Added http\Url::SANITIZE_PATH to default flags of http\Url::mod()
-* Fixed overly aggressive response caching to only consider 2xx cachable
+* Fixed VC11 build (Jan Erhardt)
 ]]></notes>
  <contents>
   <dir name="/">
diff --git a/php_http.h b/php_http.h
index 4cadffa..74d760d 100644
--- a/php_http.h
+++ b/php_http.h
@@ -13,7 +13,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_PECL_HTTP_VERSION "2.5.0"
+#define PHP_PECL_HTTP_VERSION "2.5.1dev"
 
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry
diff --git a/php_http_env_response.c b/php_http_env_response.c
index 097bdba..20a31eb 100644
--- a/php_http_env_response.c
+++ b/php_http_env_response.c
@@ -228,8 +228,8 @@ php_http_cache_status_t php_http_env_is_response_cached_by_last_modified(zval *o
 
 static zend_bool php_http_env_response_is_cacheable(php_http_env_response_t *r, php_http_message_t *request)
 {
-	TSRMLS_FETCH_FROM_CTX(r->ts);
 	long status = r->ops->get_status(r);
+	TSRMLS_FETCH_FROM_CTX(r->ts);
 
 	if (status && status / 100 != 2) {
 		return 0;