projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- bump version
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index dc673837a374377adf65a02e3f956767196c39b7..da2b04ad484ee3d006611630a6636458116c4bf3 100644
(file)
--- a/
php_http.h
+++ b/
php_http.h
@@
-18,7
+18,7
@@
#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
-#define HTTP_PEXT_VERSION "0.
9
.0dev"
+#define HTTP_PEXT_VERSION "0.
13
.0dev"
/* make compile on Win32 */
#ifdef HTTP_HAVE_CURL
/* make compile on Win32 */
#ifdef HTTP_HAVE_CURL
@@
-27,7
+27,7
@@
# endif
# include <curl/curl.h>
#endif
# endif
# include <curl/curl.h>
#endif
-#include "ext/standard/md5.h"
+
#include "phpstr/phpstr.h"
extern zend_module_entry http_module_entry;
#include "phpstr/phpstr.h"
extern zend_module_entry http_module_entry;
@@
-37,13
+37,20
@@
extern int http_module_number;
ZEND_BEGIN_MODULE_GLOBALS(http)
ZEND_BEGIN_MODULE_GLOBALS(http)
+#ifdef ZEND_ENGINE_2
+ zend_bool only_exceptions;
+#endif
struct _http_globals_etag {
struct _http_globals_etag {
+ long mode;
+ void *ctx;
zend_bool started;
zend_bool started;
- PHP_MD5_CTX md5ctx;
} etag;
struct _http_globals_log {
char *cache;
} etag;
struct _http_globals_log {
char *cache;
+ char *redirect;
+ char *allowed_methods;
+ char *composite;
} log;
struct _http_globals_send {
} log;
struct _http_globals_send {
@@
-61,10
+68,11
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
} methods;
#ifdef HTTP_HAVE_CURL
} methods;
#ifdef HTTP_HAVE_CURL
- struct _http_glob
la
s_request_copies {
+ struct _http_glob
al
s_request_copies {
zend_llist strings;
zend_llist slists;
zend_llist contexts;
zend_llist strings;
zend_llist slists;
zend_llist contexts;
+ zend_llist convs;
} copies;
# if LIBCURL_VERSION_NUM < 0x070c00
char error[CURL_ERROR_SIZE + 1];
} copies;
# if LIBCURL_VERSION_NUM < 0x070c00
char error[CURL_ERROR_SIZE + 1];
@@
-103,9
+111,10
@@
PHP_FUNCTION(http_send_data);
PHP_FUNCTION(http_send_file);
PHP_FUNCTION(http_send_stream);
PHP_FUNCTION(http_chunked_decode);
PHP_FUNCTION(http_send_file);
PHP_FUNCTION(http_send_stream);
PHP_FUNCTION(http_chunked_decode);
-PHP_FUNCTION(http_
split_respons
e);
+PHP_FUNCTION(http_
parse_messag
e);
PHP_FUNCTION(http_parse_headers);
PHP_FUNCTION(http_get_request_headers);
PHP_FUNCTION(http_parse_headers);
PHP_FUNCTION(http_get_request_headers);
+PHP_FUNCTION(http_get_request_body);
PHP_FUNCTION(http_match_request_header);
#ifdef HTTP_HAVE_CURL
PHP_FUNCTION(http_get);
PHP_FUNCTION(http_match_request_header);
#ifdef HTTP_HAVE_CURL
PHP_FUNCTION(http_get);
@@
-120,8
+129,6
@@
PHP_FUNCTION(http_request_method_unregister);
PHP_FUNCTION(http_request_method_exists);
PHP_FUNCTION(http_request_method_name);
#endif /* HTTP_HAVE_CURL */
PHP_FUNCTION(http_request_method_exists);
PHP_FUNCTION(http_request_method_name);
#endif /* HTTP_HAVE_CURL */
-PHP_FUNCTION(http_auth_basic);
-PHP_FUNCTION(http_auth_basic_cb);
#ifndef ZEND_ENGINE_2
PHP_FUNCTION(http_build_query);
#endif /* ZEND_ENGINE_2 */
#ifndef ZEND_ENGINE_2
PHP_FUNCTION(http_build_query);
#endif /* ZEND_ENGINE_2 */