| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
-#define PHP_EXT_HTTP_VERSION "0.21.0dev"
+#define PHP_EXT_HTTP_VERSION "0.22.0-dev"
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
#include "php.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
+# define HTTP_GET_REQUEST_TIME() sapi_get_request_time(TSRMLS_C)
+# else
+# define HTTP_GET_REQUEST_TIME() HTTP_G(request_time)
+# endif
+# include "SAPI.h"
+#endif
+
#ifdef HTTP_WANT_NETDB
# ifdef PHP_WIN32
+# define HTTP_HAVE_NETDB
# include <winsock2.h>
# elif defined(HAVE_NETDB_H)
+# define HTTP_HAVE_NETDB
# include <netdb.h>
# endif
#endif
extern int http_module_number;
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
ZEND_BEGIN_MODULE_GLOBALS(http)
struct _http_globals_etag {
struct _http_globals_request {
struct _http_globals_request_methods {
char *allowed;
- HashTable custom;
+ struct _http_globals_request_methods_custom {
+ int count;
+ void *entries;
+ } custom;
} methods;
} request;
+#ifndef HTTP_HAVE_SAPI_RTIME
+ time_t request_time;
+#endif
#ifdef ZEND_ENGINE_2
zend_bool only_exceptions;
#endif
zend_bool force_exit;
+ zend_bool read_post_data;
ZEND_END_MODULE_GLOBALS(http)
+ZEND_EXTERN_MODULE_GLOBALS(http);
+
#ifdef ZTS
# include "TSRM.h"
# define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v)
# define HTTP_G(v) (http_globals.v)
# define HTTP_GLOBALS (&http_globals)
#endif
-#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS;
+#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS
PHP_FUNCTION(http_test);
PHP_FUNCTION(http_date);
PHP_FUNCTION(http_parse_cookie);
PHP_FUNCTION(http_get_request_headers);
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);