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 property access
[m6w6/ext-http]
/
http.c
diff --git
a/http.c
b/http.c
index b1039ade5fa4024e3cb741a5afa0aaa5905436eb..528f8bad300a77dac1dfaaaa6c5fbf19abc835fe 100644
(file)
--- a/
http.c
+++ b/
http.c
@@
-71,7
+71,7
@@
ZEND_GET_MODULE(http)
#endif
/* {{{ http_functions[] */
#endif
/* {{{ http_functions[] */
-function_entry http_functions[] = {
+
zend_
function_entry http_functions[] = {
PHP_FE(http_test, NULL)
PHP_FE(http_date, NULL)
PHP_FE(http_absolute_uri, NULL)
PHP_FE(http_test, NULL)
PHP_FE(http_date, NULL)
PHP_FE(http_absolute_uri, NULL)
@@
-112,7
+112,8
@@
function_entry http_functions[] = {
PHP_FE(http_build_query, NULL)
#endif
PHP_FE(ob_etaghandler, NULL)
PHP_FE(http_build_query, NULL)
#endif
PHP_FE(ob_etaghandler, NULL)
- {NULL, NULL, NULL}
+
+ EMPTY_FUNCTION_ENTRY
};
/* }}} */
};
/* }}} */
@@
-223,7
+224,7
@@
PHP_INI_DISP(http_etag_mode_displayer)
if (!hash_name) {
ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5"));
} else {
if (!hash_name) {
ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5"));
} else {
- ZEND_WRITE("HTTP_ETAG_MHASH
|MHASH_", lenof("HTTP_ETAG_MHASH|
MHASH_"));
+ ZEND_WRITE("HTTP_ETAG_MHASH
_", lenof("HTTP_ETAG_
MHASH_"));
ZEND_WRITE(hash_name, strlen(hash_name));
}
}
ZEND_WRITE(hash_name, strlen(hash_name));
}
}
@@
-249,7
+250,6
@@
PHP_INI_BEGIN()
PHP_INI_END()
/* }}} */
PHP_INI_END()
/* }}} */
-
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(http)
{
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(http)
{
@@
-259,12
+259,14
@@
PHP_MINIT_FUNCTION(http)
REGISTER_INI_ENTRIES();
REGISTER_INI_ENTRIES();
- HTTP_LONG_CONSTANT("HTTP_ETAG_MD5", HTTP_ETAG_MD5);
- HTTP_LONG_CONSTANT("HTTP_ETAG_SHA1", HTTP_ETAG_SHA1);
- HTTP_LONG_CONSTANT("HTTP_ETAG_MHASH", HTTP_ETAG_MHASH);
-
+ if (SUCCESS != http_cache_global_init()) {
+ return FAILURE;
+ }
+ if (SUCCESS != http_request_method_global_init()) {
+ return FAILURE;
+ }
#ifdef HTTP_HAVE_CURL
#ifdef HTTP_HAVE_CURL
- if (
CURLE_OK != curl_global_init(CURL_GLOBAL_ALL
)) {
+ if (
SUCCESS != http_request_global_init(
)) {
return FAILURE;
}
#endif /* HTTP_HAVE_CURL */
return FAILURE;
}
#endif /* HTTP_HAVE_CURL */
@@
-291,7
+293,7
@@
PHP_MSHUTDOWN_FUNCTION(http)
{
UNREGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
{
UNREGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
-
curl
_global_cleanup();
+
http_request
_global_cleanup();
#endif
return SUCCESS;
}
#endif
return SUCCESS;
}
@@
-314,6
+316,13
@@
PHP_RINIT_FUNCTION(http)
/* {{{ PHP_RSHUTDOWN_FUNCTION */
PHP_RSHUTDOWN_FUNCTION(http)
{
/* {{{ PHP_RSHUTDOWN_FUNCTION */
PHP_RSHUTDOWN_FUNCTION(http)
{
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+ int i, c = zend_hash_num_elements(&HTTP_G(request).methods.custom);
+
+ for (i = 0; i < c; ++i) {
+ http_request_method_unregister(HTTP_MAX_REQUEST_METHOD + i);
+ }
+#endif
http_globals_free(HTTP_GLOBALS);
return SUCCESS;
}
http_globals_free(HTTP_GLOBALS);
return SUCCESS;
}