projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- more fixes for empty message info
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index 431e7fb033847f5ca007e49a4b61280e0b793f27..67509c9339ee3f9fbdd6e0e6e73165d9e9cab48e 100644
(file)
--- a/
php_http.h
+++ b/
php_http.h
@@
-15,7
+15,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 "1.
0.1dev
"
+#define PHP_EXT_HTTP_VERSION "1.
4.0
"
#ifdef HAVE_CONFIG_H
# include "config.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
@@
-26,14
+26,13
@@
#endif
#include "php.h"
#endif
#include "php.h"
+#include "missing.h"
#include "php_http_std_defs.h"
#include "phpstr/phpstr.h"
#include "php_http_std_defs.h"
#include "phpstr/phpstr.h"
-#include "missing.h"
#ifdef HTTP_WANT_SAPI
# if PHP_API_VERSION > 20041225
# define HTTP_HAVE_SAPI_RTIME
#ifdef HTTP_WANT_SAPI
# if PHP_API_VERSION > 20041225
# define HTTP_HAVE_SAPI_RTIME
-# else
# endif
# include "SAPI.h"
#endif
# endif
# include "SAPI.h"
#endif
@@
-72,6
+71,8
@@
#endif
#include <ctype.h>
#endif
#include <ctype.h>
+#define HTTP_IS_CTYPE(type, c) is##type((int) (unsigned char) (c))
+#define HTTP_TO_CTYPE(type, c) to##type((int) (unsigned char) (c))
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
@@
-101,6
+102,7
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
char *unquoted_etag;
time_t last_modified;
struct _http_globals_send_deflate {
char *unquoted_etag;
time_t last_modified;
struct _http_globals_send_deflate {
+ zend_bool response;
zend_bool start_auto;
long start_flags;
int encoding;
zend_bool start_auto;
long start_flags;
int encoding;
@@
-116,6
+118,7
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
struct _http_globals_request {
time_t time;
struct _http_globals_request {
time_t time;
+ HashTable *headers;
struct _http_globals_request_methods {
char *allowed;
struct _http_globals_request_methods_custom {
struct _http_globals_request_methods {
char *allowed;
struct _http_globals_request_methods_custom {
@@
-124,6
+127,15
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
void *entries;
} custom;
} methods;
void *entries;
} custom;
} methods;
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+ struct _http_globals_request_datashare {
+ zend_llist handles;
+ zend_bool cookie;
+ zend_bool dns;
+ zend_bool ssl;
+ zend_bool connect;
+ } datashare;
+#endif
} request;
#ifdef ZEND_ENGINE_2
} request;
#ifdef ZEND_ENGINE_2
@@
-132,6
+144,7
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
zend_bool force_exit;
zend_bool read_post_data;
zend_bool force_exit;
zend_bool read_post_data;
+ zval *server_var;
ZEND_END_MODULE_GLOBALS(http)
ZEND_END_MODULE_GLOBALS(http)
@@
-152,7
+165,7
@@
ZEND_EXTERN_MODULE_GLOBALS(http);
# define HTTP_HAVE_SESSION
#endif
# define HTTP_HAVE_SESSION
#endif
-#if defined(HAVE_HASH_EXT) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_HASH)
&& defined(HTTP_HAVE_PHP_HASH_H)
)
+#if defined(HAVE_HASH_EXT) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_HASH)
) && defined(HTTP_HAVE_PHP_HASH_H
)
# define HTTP_HAVE_HASH
#endif
# define HTTP_HAVE_HASH
#endif
@@
-160,7
+173,6
@@
ZEND_EXTERN_MODULE_GLOBALS(http);
# define HTTP_HAVE_SPL
#endif
# define HTTP_HAVE_SPL
#endif
-PHP_FUNCTION(http_test);
PHP_FUNCTION(http_date);
PHP_FUNCTION(http_build_url);
PHP_FUNCTION(http_build_str);
PHP_FUNCTION(http_date);
PHP_FUNCTION(http_build_url);
PHP_FUNCTION(http_build_str);
@@
-184,6
+196,7
@@
PHP_FUNCTION(http_chunked_decode);
PHP_FUNCTION(http_parse_message);
PHP_FUNCTION(http_parse_headers);
PHP_FUNCTION(http_parse_cookie);
PHP_FUNCTION(http_parse_message);
PHP_FUNCTION(http_parse_headers);
PHP_FUNCTION(http_parse_cookie);
+PHP_FUNCTION(http_build_cookie);
PHP_FUNCTION(http_parse_params);
PHP_FUNCTION(http_get_request_headers);
PHP_FUNCTION(http_get_request_body);
PHP_FUNCTION(http_parse_params);
PHP_FUNCTION(http_get_request_headers);
PHP_FUNCTION(http_get_request_body);
@@
-198,9
+211,7
@@
PHP_FUNCTION(http_put_data);
PHP_FUNCTION(http_put_file);
PHP_FUNCTION(http_put_stream);
PHP_FUNCTION(http_request);
PHP_FUNCTION(http_put_file);
PHP_FUNCTION(http_put_stream);
PHP_FUNCTION(http_request);
-#ifdef HAVE_CURL_GETFORMDATA
PHP_FUNCTION(http_request_body_encode);
PHP_FUNCTION(http_request_body_encode);
-#endif /* HAVE_CURL_GETFORMDATA */
#endif /* HTTP_HAVE_CURL */
PHP_FUNCTION(http_request_method_register);
PHP_FUNCTION(http_request_method_unregister);
#endif /* HTTP_HAVE_CURL */
PHP_FUNCTION(http_request_method_register);
PHP_FUNCTION(http_request_method_unregister);