projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- fix capture mode (again)
[m6w6/ext-http]
/
http.c
diff --git
a/http.c
b/http.c
index 2cd87113dee0122a0c962a6c1dbb0a8766546b8e..dc8d7dd7c44f68bec6d5118320d88a7d25b8cc88 100644
(file)
--- a/
http.c
+++ b/
http.c
@@
-102,8
+102,6
@@
function_entry http_functions[] = {
PHP_FE(http_request_method_exists, NULL)
PHP_FE(http_request_method_name, NULL)
#endif
PHP_FE(http_request_method_exists, NULL)
PHP_FE(http_request_method_name, NULL)
#endif
- PHP_FE(http_auth_basic, NULL)
- PHP_FE(http_auth_basic_cb, NULL)
#ifndef ZEND_ENGINE_2
PHP_FE(http_build_query, NULL)
#endif
#ifndef ZEND_ENGINE_2
PHP_FE(http_build_query, NULL)
#endif
@@
-226,7
+224,9
@@
PHP_MINIT_FUNCTION(http)
#ifdef ZEND_ENGINE_2
http_util_object_init();
http_message_object_init();
#ifdef ZEND_ENGINE_2
http_util_object_init();
http_message_object_init();
+# ifndef WONKY
http_response_object_init();
http_response_object_init();
+# endif
# ifdef HTTP_HAVE_CURL
http_request_object_init();
http_requestpool_object_init();
# ifdef HTTP_HAVE_CURL
http_request_object_init();
http_requestpool_object_init();
@@
-234,10
+234,6
@@
PHP_MINIT_FUNCTION(http)
http_exception_object_init();
#endif /* ZEND_ENGINE_2 */
http_exception_object_init();
#endif /* ZEND_ENGINE_2 */
-#ifdef ZEND_ENGINE_2
- zend_hash_init_ex(&http_response_statics, 0, NULL, ZVAL_INTERNAL_PTR_DTOR, 1, 0);
- zend_fix_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
-#endif
return SUCCESS;
}
/* }}} */
return SUCCESS;
}
/* }}} */
@@
-245,9
+241,6
@@
PHP_MINIT_FUNCTION(http)
/* {{{ PHP_MSHUTDOWN_FUNCTION */
PHP_MSHUTDOWN_FUNCTION(http)
{
/* {{{ PHP_MSHUTDOWN_FUNCTION */
PHP_MSHUTDOWN_FUNCTION(http)
{
-#ifdef ZEND_ENGINE_2
- zend_hash_destroy(&http_response_statics);
-#endif
UNREGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
curl_global_cleanup();
UNREGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
curl_global_cleanup();
@@
-266,9
+259,6
@@
PHP_RINIT_FUNCTION(http)
}
http_globals_init(HTTP_GLOBALS);
}
http_globals_init(HTTP_GLOBALS);
-#ifdef ZEND_ENGINE_2
- zend_init_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
-#endif
return SUCCESS;
}
/* }}} */
return SUCCESS;
}
/* }}} */
@@
-276,9
+266,6
@@
PHP_RINIT_FUNCTION(http)
/* {{{ PHP_RSHUTDOWN_FUNCTION */
PHP_RSHUTDOWN_FUNCTION(http)
{
/* {{{ PHP_RSHUTDOWN_FUNCTION */
PHP_RSHUTDOWN_FUNCTION(http)
{
-#ifdef ZEND_ENGINE_2
- zend_clean_static_properties(http_response_object_ce TSRMLS_CC);
-#endif
http_globals_free(HTTP_GLOBALS);
return SUCCESS;
}
http_globals_free(HTTP_GLOBALS);
return SUCCESS;
}