projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
* don't restart "default output handler"
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index 4ed736c0526ce341b457714d57225cd32b04a8a0..29d868c06f8e09f467526b723d6693a0e4e37fb5 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 PHP_EXT_HTTP_VERSION "0.
3.0
"
+#define PHP_EXT_HTTP_VERSION "0.
5.0-dev
"
/* make compile on Win32 */
#include "php_streams.h"
/* make compile on Win32 */
#include "php_streams.h"
@@
-28,10
+28,14
@@
extern zend_module_entry http_module_entry;
#define phpext_http_ptr &http_module_entry
#ifdef ZTS
#define phpext_http_ptr &http_module_entry
#ifdef ZTS
-#include "TSRM.h"
-#define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v)
+#
include "TSRM.h"
+#
define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v)
#else
#else
-#define HTTP_G(v) (http_globals.v)
+# define HTTP_G(v) (http_globals.v)
+#endif
+
+#ifndef ZEND_ENGINE_2
+# include "php_http_build_query.h"
#endif
PHP_FUNCTION(http_date);
#endif
PHP_FUNCTION(http_date);
@@
-52,6
+56,8
@@
PHP_FUNCTION(http_send_file);
PHP_FUNCTION(http_send_stream);
PHP_FUNCTION(http_chunked_decode);
PHP_FUNCTION(http_split_response);
PHP_FUNCTION(http_send_stream);
PHP_FUNCTION(http_chunked_decode);
PHP_FUNCTION(http_split_response);
+PHP_FUNCTION(http_parse_headers);
+PHP_FUNCTION(http_get_request_headers);
#ifdef HTTP_HAVE_CURL
PHP_FUNCTION(http_get);
PHP_FUNCTION(http_head);
#ifdef HTTP_HAVE_CURL
PHP_FUNCTION(http_get);
PHP_FUNCTION(http_head);
@@
-61,7
+67,10
@@
PHP_FUNCTION(http_post_array);
PHP_FUNCTION(http_auth_basic);
PHP_FUNCTION(http_auth_basic_cb);
PHP_FUNCTION(http_auth_basic);
PHP_FUNCTION(http_auth_basic_cb);
+PHP_FUNCTION(ob_httpetaghandler);
+
PHP_MINIT_FUNCTION(http);
PHP_MINIT_FUNCTION(http);
+PHP_MSHUTDOWN_FUNCTION(http);
PHP_RSHUTDOWN_FUNCTION(http);
PHP_MINFO_FUNCTION(http);
PHP_RSHUTDOWN_FUNCTION(http);
PHP_MINFO_FUNCTION(http);
@@
-72,6
+81,7
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
char *ctype;
char *etag;
time_t lmod;
char *ctype;
char *etag;
time_t lmod;
+ char *allowed_methods;
#ifdef HTTP_HAVE_CURL
struct {
struct {
#ifdef HTTP_HAVE_CURL
struct {
struct {