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 a mistake crept in which prevented from setting custom request content type
[m6w6/ext-http]
/
http.c
diff --git
a/http.c
b/http.c
index 76d4dff7e7ba86e7e354bd203083ae3ea554b5f3..75ca08854053cb51c9671f3e59697eaa05ef32f9 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"
@@
-123,7
+124,7
@@
zend_function_entry http_functions[] = {
/* {{{ 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
@@
-133,6
+134,9
@@
static zend_module_dep http_module_dep[] = {
# 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}
};
#endif
@@
-142,7
+146,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
+243,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