From: Michael Wallner <mike@php.net>
Date: Wed, 15 Jun 2016 14:11:52 +0000 (+0200)
Subject: Merge branch 'v2.6.x'
X-Git-Tag: RELEASE_3_1_0_BETA1~7
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=28d7c572181c8c3c335edd3df539f75c3bbde0fd;hp=-c

Merge branch 'v2.6.x'
---

28d7c572181c8c3c335edd3df539f75c3bbde0fd
diff --combined src/php_http_api.h
index 9487612,8c0b9be..7fe3d10
--- a/src/php_http_api.h
+++ b/src/php_http_api.h
@@@ -23,8 -23,8 +23,8 @@@
  #include "php.h"
  #include "SAPI.h"
  
 -#include "ext/raphf/php_raphf.h"
 -#include "ext/propro/php_propro.h"
 +#include "ext/raphf/php_raphf_api.h"
 +#include "ext/propro/php_propro_api.h"
  #include "ext/standard/php_string.h"
  #include "ext/spl/spl_iterators.h"
  #include "ext/date/php_date.h"
@@@ -101,29 -101,22 +101,29 @@@
  #include "php_http_client_request.h"
  #include "php_http_client_response.h"
  #include "php_http_client_curl.h"
- #include "php_http_client_curl_user.h"
  #include "php_http_client_curl_event.h"
+ #include "php_http_client_curl_user.h"
  #include "php_http_url.h"
  #include "php_http_version.h"
  
  ZEND_BEGIN_MODULE_GLOBALS(php_http)
  	struct php_http_env_globals env;
 +#ifdef PHP_HTTP_HAVE_CLIENT
 +	struct {
 +#ifdef PHP_HTTP_HAVE_CURL
 +		struct php_http_client_curl_globals curl;
 +#endif
 +	} client;
 +#endif
  ZEND_END_MODULE_GLOBALS(php_http)
  
  ZEND_EXTERN_MODULE_GLOBALS(php_http);
  
  #ifdef ZTS
  #	include "TSRM/TSRM.h"
 -#	define PHP_HTTP_G ((zend_php_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(php_http_globals_id)])
 +#	define PHP_HTTP_G ((zend_php_http_globals *) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(php_http_globals_id)])
  #	undef TSRMLS_FETCH_FROM_CTX
 -#	define TSRMLS_FETCH_FROM_CTX(ctx) void ***tsrm_ls = ((ctx)?(ctx):ts_resource_ex(0, NULL))
 +#	define TSRMLS_FETCH_FROM_CTX(ctx) ERROR
  #else
  #	define PHP_HTTP_G (&php_http_globals)
  #endif