projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag 'RELEASE_1_5_0_RC1'.
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index c93067ec2824afdb03e5e2c2995a13c072558a33..005498b35bdf28adb0f44a8ded6bb7af9f96f4ec 100644
(file)
--- a/
php_http.h
+++ b/
php_http.h
@@
-6,7
+6,7
@@
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-200
6
, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-200
7
, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
+--------------------------------------------------------------------+
*/
@@
-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.
3.
1"
+#define PHP_EXT_HTTP_VERSION "1.
5.0RC
1"
#ifdef HAVE_CONFIG_H
# include "config.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
@@
-102,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;
@@
-137,12
+138,24
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
#endif
} request;
#endif
} request;
+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+ struct _http_globals_persistent {
+ struct _http_globals_persistent_handles {
+ struct _http_globals_persistent_handles_ident {
+ ulong h;
+ char *s;
+ size_t l;
+ } ident;
+ } handles;
+ } persistent;
+#endif
#ifdef ZEND_ENGINE_2
zend_bool only_exceptions;
#endif
zend_bool force_exit;
zend_bool read_post_data;
#ifdef ZEND_ENGINE_2
zend_bool only_exceptions;
#endif
zend_bool force_exit;
zend_bool read_post_data;
+ zval *server_var;
ZEND_END_MODULE_GLOBALS(http)
ZEND_END_MODULE_GLOBALS(http)
@@
-171,7
+184,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);
@@
-202,6
+214,11
@@
PHP_FUNCTION(http_get_request_body);
PHP_FUNCTION(http_get_request_body_stream);
PHP_FUNCTION(http_match_request_header);
#ifdef HTTP_HAVE_CURL
PHP_FUNCTION(http_get_request_body_stream);
PHP_FUNCTION(http_match_request_header);
#ifdef HTTP_HAVE_CURL
+# ifdef HTTP_HAVE_PERSISTENT_HANDLES
+PHP_FUNCTION(http_persistent_handles_count);
+PHP_FUNCTION(http_persistent_handles_clean);
+PHP_FUNCTION(http_persistent_handles_ident);
+# endif
PHP_FUNCTION(http_get);
PHP_FUNCTION(http_head);
PHP_FUNCTION(http_post_data);
PHP_FUNCTION(http_get);
PHP_FUNCTION(http_head);
PHP_FUNCTION(http_post_data);