X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http.c;h=0bf09ac775a44c39584e5ef5faae926a67c31ece;hb=d8beb35c8d7194ef1688cfd8dd6ed40ec8e31464;hp=5ee038d392cd938870f4d61fc3fc0a3c20c53161;hpb=dedd682f1f67f8af921c87653c58863f355ead43;p=m6w6%2Fext-http diff --git a/php_http.c b/php_http.c index 5ee038d..0bf09ac 100644 --- a/php_http.c +++ b/php_http.c @@ -117,14 +117,6 @@ static inline void php_http_globals_free(zend_php_http_globals *G TSRMLS_DC) } #endif -#if ZTS && PHP_DEBUG && !HAVE_GCOV -zend_php_http_globals *php_http_globals(void) -{ - TSRMLS_FETCH(); - return PHP_HTTP_G; -} -#endif - PHP_INI_BEGIN() STD_PHP_INI_ENTRY("http.etag.mode", "crc32b", PHP_INI_ALL, OnUpdateString, env.etag_mode, zend_php_http_globals, php_http_globals) PHP_INI_END() @@ -188,9 +180,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 +190,6 @@ PHP_RINIT_FUNCTION(http) 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;