Merge branch 'R_2_1'

diff --combined php_http.c
index 5ee038d392cd938870f4d61fc3fc0a3c20c53161,3200a16eb2dbea26991e2b44023bfa193eb4755e..f7a0b8698f03012f2d8460532fcdb37504ea5649
--- 1/php_http.c
--- 2/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;