projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- remove unused bits
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index 389493d666799f50666eb6b37fd70ed10277f8c6..5de996a677c051bc5fe6e323558fc11e7b0f7ef9 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.1
"
+#define PHP_EXT_HTTP_VERSION "1.
3.1dev
"
#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
@@
-124,6
+123,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
@@
-152,7
+160,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
@@
-184,6
+192,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
+207,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);