From: Michael Wallner <mike@php.net>
Date: Mon, 1 Sep 2014 09:03:42 +0000 (+0200)
Subject: Merge branch 'R_2_1'
X-Git-Tag: RELEASE_2_2_0_RC1~15^2~1
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=f155d6d142f3320ec0d327a993773d453e25ddc3;hp=-c

Merge branch 'R_2_1'
---

f155d6d142f3320ec0d327a993773d453e25ddc3
diff --combined php_http.c
index 5ee038d,3200a16..f7a0b86
--- a/php_http.c
+++ b/php_http.c
@@@ -142,7 -142,6 +142,7 @@@ PHP_MINIT_FUNCTION(http
  	|| SUCCESS != PHP_MINIT_CALL(http_filter)
  	|| SUCCESS != PHP_MINIT_CALL(http_header)
  	|| SUCCESS != PHP_MINIT_CALL(http_message)
 +	|| SUCCESS != PHP_MINIT_CALL(http_message_parser)
  	|| SUCCESS != PHP_MINIT_CALL(http_message_body)
  	|| SUCCESS != PHP_MINIT_CALL(http_querystring)
  	|| SUCCESS != PHP_MINIT_CALL(http_client)
@@@ -188,9 -187,6 +188,6 @@@ PHP_RINIT_FUNCTION(http
  {
  	if (0
  	|| SUCCESS != PHP_RINIT_CALL(http_env)
- #if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
- 	|| SUCCESS != PHP_RINIT_CALL(http_client_curl)
- #endif
  	) {
  		return FAILURE;
  	}
@@@ -201,9 -197,6 +198,6 @@@
  PHP_RSHUTDOWN_FUNCTION(http)
  {
  	if (0
- #if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
- 	|| SUCCESS != PHP_RSHUTDOWN_CALL(http_client_curl)
- #endif
  	|| SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
  	) {
  		return FAILURE;