projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- add clean_ob parameter to HttpResponse::send()
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index 952639c87af8bc84d037a5ff3484aa2971e4c3b3..f9d95a8433853f7b4add6251b38c51206130394b 100644
(file)
--- a/
php_http.h
+++ b/
php_http.h
@@
-33,30
+33,54
@@
extern zend_module_entry http_module_entry;
#define phpext_http_ptr &http_module_entry
extern zend_module_entry http_module_entry;
#define phpext_http_ptr &http_module_entry
+extern int http_module_number;
+
ZEND_BEGIN_MODULE_GLOBALS(http)
ZEND_BEGIN_MODULE_GLOBALS(http)
- zend_bool etag_started;
- PHP_MD5_CTX etag_md5;
- php_stream_statbuf ssb;
- char *ctype;
- char *etag;
- time_t lmod;
- char *allowed_methods;
- char *cache_log;
+
+ struct _http_globals_etag {
+ zend_bool started;
+ PHP_MD5_CTX md5ctx;
+ } etag;
+
+ struct _http_globals_log {
+ char *cache;
+ } log;
+
+ struct _http_globals_send {
+ double throttle_delay;
+ size_t buffer_size;
+ char *content_type;
+ char *unquoted_etag;
+ time_t last_modified;
+ } send;
+
+ struct _http_globals_request {
+ struct _http_globals_request_methods {
+ char *allowed;
+ HashTable custom;
+ } methods;
#ifdef HTTP_HAVE_CURL
#ifdef HTTP_HAVE_CURL
+ struct _http_globals_request_curl {
+ zend_llist copies;
# if LIBCURL_VERSION_NUM < 0x070c00
# if LIBCURL_VERSION_NUM < 0x070c00
-
char curler
r[CURL_ERROR_SIZE + 1];
+
char erro
r[CURL_ERROR_SIZE + 1];
# endif
# endif
-
zend_llist to_free
;
+
} curl
;
#endif /* HTTP_HAVE_CURL */
#endif /* HTTP_HAVE_CURL */
+ } request;
+
ZEND_END_MODULE_GLOBALS(http)
#ifdef ZTS
# include "TSRM.h"
# define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v)
ZEND_END_MODULE_GLOBALS(http)
#ifdef ZTS
# include "TSRM.h"
# define HTTP_G(v) TSRMG(http_globals_id, zend_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)
#else
# define HTTP_G(v) (http_globals.v)
+# define HTTP_GLOBALS http_globals
#endif
#endif
+#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS;
PHP_FUNCTION(http_test);
PHP_FUNCTION(http_date);
PHP_FUNCTION(http_test);
PHP_FUNCTION(http_date);
@@
-64,6
+88,7
@@
PHP_FUNCTION(http_absolute_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);
+PHP_FUNCTION(http_throttle);
PHP_FUNCTION(http_send_status);
PHP_FUNCTION(http_send_last_modified);
PHP_FUNCTION(http_send_content_type);
PHP_FUNCTION(http_send_status);
PHP_FUNCTION(http_send_last_modified);
PHP_FUNCTION(http_send_content_type);
@@
-86,6
+111,11
@@
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)*/
+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);
#endif /* HTTP_HAVE_CURL */
PHP_FUNCTION(http_auth_basic);
PHP_FUNCTION(http_auth_basic_cb);