projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
typo
[m6w6/ext-http]
/
http.c
diff --git
a/http.c
b/http.c
index 76d4dff7e7ba86e7e354bd203083ae3ea554b5f3..d514b3841efa4adb28eaa978a37a4996de27d51b 100644
(file)
--- a/
http.c
+++ b/
http.c
@@
-24,6
+24,7
@@
#include "php_http_api.h"
#include "php_http_send_api.h"
#include "php_http_api.h"
#include "php_http_send_api.h"
+#include "php_http_cookie_api.h"
#include "php_http_cache_api.h"
#include "php_http_send_api.h"
#include "php_http_message_api.h"
#include "php_http_cache_api.h"
#include "php_http_send_api.h"
#include "php_http_message_api.h"
@@
-70,7
+71,7
@@
zend_function_entry http_functions[] = {
PHP_FE(http_build_url, http_arg_pass_ref_4)
PHP_FE(http_build_str, NULL)
#ifndef ZEND_ENGINE_2
PHP_FE(http_build_url, http_arg_pass_ref_4)
PHP_FE(http_build_str, NULL)
#ifndef ZEND_ENGINE_2
- PHP_FALIAS(http_build_query, http_build_str)
+ PHP_FALIAS(http_build_query, http_build_str
, NULL
)
#endif
PHP_FE(http_negotiate_language, http_arg_pass_ref_2)
PHP_FE(http_negotiate_charset, http_arg_pass_ref_2)
#endif
PHP_FE(http_negotiate_language, http_arg_pass_ref_2)
PHP_FE(http_negotiate_charset, http_arg_pass_ref_2)
@@
-101,6
+102,7
@@
zend_function_entry http_functions[] = {
PHP_FE(http_head, http_arg_pass_ref_3)
PHP_FE(http_post_data, http_arg_pass_ref_4)
PHP_FE(http_post_fields, http_arg_pass_ref_5)
PHP_FE(http_head, http_arg_pass_ref_3)
PHP_FE(http_post_data, http_arg_pass_ref_4)
PHP_FE(http_post_fields, http_arg_pass_ref_5)
+ PHP_FE(http_put_data, http_arg_pass_ref_4)
PHP_FE(http_put_file, http_arg_pass_ref_4)
PHP_FE(http_put_stream, http_arg_pass_ref_4)
#endif
PHP_FE(http_put_file, http_arg_pass_ref_4)
PHP_FE(http_put_stream, http_arg_pass_ref_4)
#endif
@@
-121,9
+123,15
@@
zend_function_entry http_functions[] = {
};
/* }}} */
};
/* }}} */
+PHP_MINIT_FUNCTION(http);
+PHP_MSHUTDOWN_FUNCTION(http);
+PHP_RINIT_FUNCTION(http);
+PHP_RSHUTDOWN_FUNCTION(http);
+PHP_MINFO_FUNCTION(http);
+
/* {{{ http_module_dep */
#if ZEND_EXTENSION_API_NO >= 220050617
/* {{{ http_module_dep */
#if ZEND_EXTENSION_API_NO >= 220050617
-static zend_module_dep http_module_dep[] = {
+static zend_module_dep http_module_dep
s
[] = {
# ifdef HAVE_SPL
ZEND_MOD_REQUIRED("spl")
# endif
# ifdef HAVE_SPL
ZEND_MOD_REQUIRED("spl")
# endif
@@
-132,6
+140,9
@@
static zend_module_dep http_module_dep[] = {
# endif
# ifdef HAVE_PHP_SESSION
ZEND_MOD_REQUIRED("session")
# endif
# ifdef HAVE_PHP_SESSION
ZEND_MOD_REQUIRED("session")
+# endif
+# ifdef HAVE_ICONV
+ ZEND_MOD_REQUIRED("iconv")
# endif
{NULL, NULL, NULL, 0}
};
# endif
{NULL, NULL, NULL, 0}
};
@@
-142,7
+153,7
@@
static zend_module_dep http_module_dep[] = {
zend_module_entry http_module_entry = {
#if ZEND_EXTENSION_API_NO >= 220050617
STANDARD_MODULE_HEADER_EX, NULL,
zend_module_entry http_module_entry = {
#if ZEND_EXTENSION_API_NO >= 220050617
STANDARD_MODULE_HEADER_EX, NULL,
- http_module_dep,
+ http_module_dep
s
,
#else
STANDARD_MODULE_HEADER,
#endif
#else
STANDARD_MODULE_HEADER,
#endif
@@
-239,6
+250,7
@@
PHP_MINIT_FUNCTION(http)
REGISTER_INI_ENTRIES();
if ( (SUCCESS != PHP_MINIT_CALL(http_support)) ||
REGISTER_INI_ENTRIES();
if ( (SUCCESS != PHP_MINIT_CALL(http_support)) ||
+ (SUCCESS != PHP_MINIT_CALL(http_cookie)) ||
(SUCCESS != PHP_MINIT_CALL(http_send)) ||
(SUCCESS != PHP_MINIT_CALL(http_url)) ||
#ifdef HTTP_HAVE_CURL
(SUCCESS != PHP_MINIT_CALL(http_send)) ||
(SUCCESS != PHP_MINIT_CALL(http_url)) ||
#ifdef HTTP_HAVE_CURL