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 remaining issues; there's still a 1-byte memleak I could not find yet
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index 467507eea514a90c153dd0ef626d74efb9915e1d..9394129ffdbeecac1e4dabce55e4396edcddbdab 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.
8.0
"
+#define HTTP_PEXT_VERSION "0.
16.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 {
@@
-52,6
+59,7
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
char *content_type;
char *unquoted_etag;
time_t last_modified;
char *content_type;
char *unquoted_etag;
time_t last_modified;
+ int gzip_encoding;
} send;
struct _http_globals_request {
} send;
struct _http_globals_request {
@@
-61,12
+69,15
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
} methods;
#ifdef HTTP_HAVE_CURL
} methods;
#ifdef HTTP_HAVE_CURL
- struct _http_globals_request_curl {
- zend_llist copies;
-# if LIBCURL_VERSION_NUM < 0x070c00
- char error[CURL_ERROR_SIZE + 1];
+ struct _http_globals_request_copies {
+ zend_llist strings;
+ zend_llist slists;
+ zend_llist contexts;
+ zend_llist convs;
+ } copies;
+# ifndef HAVE_CURL_EASY_STRERROR
+ char error[CURL_ERROR_SIZE + 1];
# endif
# endif
- } curl;
#endif /* HTTP_HAVE_CURL */
} request;
#endif /* HTTP_HAVE_CURL */
} request;
@@
-78,13
+89,13
@@
ZEND_END_MODULE_GLOBALS(http)
# define HTTP_GLOBALS ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
#else
# define HTTP_G(v) (http_globals.v)
# define HTTP_GLOBALS ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
#else
# define HTTP_G(v) (http_globals.v)
-# define HTTP_GLOBALS
http_globals
+# define HTTP_GLOBALS
(&http_globals)
#endif
#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS;
PHP_FUNCTION(http_test);
PHP_FUNCTION(http_date);
#endif
#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS;
PHP_FUNCTION(http_test);
PHP_FUNCTION(http_date);
-PHP_FUNCTION(http_
absolute
_uri);
+PHP_FUNCTION(http_
build
_uri);
PHP_FUNCTION(http_negotiate_language);
PHP_FUNCTION(http_negotiate_charset);
PHP_FUNCTION(http_redirect);
PHP_FUNCTION(http_negotiate_language);
PHP_FUNCTION(http_negotiate_charset);
PHP_FUNCTION(http_redirect);
@@
-101,9
+112,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);
@@
-112,18
+124,24
@@
PHP_FUNCTION(http_post_data);
PHP_FUNCTION(http_post_fields);
PHP_FUNCTION(http_put_file);
PHP_FUNCTION(http_put_stream);
PHP_FUNCTION(http_post_fields);
PHP_FUNCTION(http_put_file);
PHP_FUNCTION(http_put_stream);
-
/*PHP_FUNCTION(http_request)
*/
+
#endif /* HTTP_HAVE_CURL
*/
PHP_FUNCTION(http_request_method_register);
PHP_FUNCTION(http_request_method_unregister);
PHP_FUNCTION(http_request_method_exists);
PHP_FUNCTION(http_request_method_name);
PHP_FUNCTION(http_request_method_register);
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_auth_basic);
-PHP_FUNCTION(http_auth_basic_cb);
#ifndef ZEND_ENGINE_2
PHP_FUNCTION(http_build_query);
#endif /* ZEND_ENGINE_2 */
PHP_FUNCTION(ob_etaghandler);
#ifndef ZEND_ENGINE_2
PHP_FUNCTION(http_build_query);
#endif /* ZEND_ENGINE_2 */
PHP_FUNCTION(ob_etaghandler);
+#ifdef HTTP_HAVE_ZLIB
+PHP_FUNCTION(http_gzencode);
+PHP_FUNCTION(http_gzdecode);
+PHP_FUNCTION(http_deflate);
+PHP_FUNCTION(http_inflate);
+PHP_FUNCTION(http_compress);
+PHP_FUNCTION(http_uncompress);
+#endif
+PHP_FUNCTION(http_support);
PHP_MINIT_FUNCTION(http);
PHP_MSHUTDOWN_FUNCTION(http);
PHP_MINIT_FUNCTION(http);
PHP_MSHUTDOWN_FUNCTION(http);