#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
-#define PHP_EXT_HTTP_VERSION "1.0.0-dev"
+#define PHP_EXT_HTTP_VERSION "1.4.0dev"
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "php.h"
+#include "missing.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
-# else
# endif
# include "SAPI.h"
#endif
#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
struct _http_globals_log {
char *cache;
char *redirect;
+ char *not_found;
char *allowed_methods;
char *composite;
} log;
char *unquoted_etag;
time_t last_modified;
struct _http_globals_send_deflate {
+ zend_bool response;
zend_bool start_auto;
long start_flags;
int encoding;
long start_flags;
void *stream;
} inflate;
+ zend_bool not_found_404;
} send;
struct _http_globals_request {
time_t time;
+ HashTable *headers;
struct _http_globals_request_methods {
char *allowed;
struct _http_globals_request_methods_custom {
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
zend_bool force_exit;
zend_bool read_post_data;
+ zval *server_var;
ZEND_END_MODULE_GLOBALS(http)
# define HTTP_G (&http_globals)
#endif
-PHP_FUNCTION(http_test);
+#if defined(HAVE_ICONV) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_ICONV))
+# define HTTP_HAVE_ICONV
+#endif
+
+#if defined(HAVE_PHP_SESSION) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_SESSION))
+# define HTTP_HAVE_SESSION
+#endif
+
+#if defined(HAVE_HASH_EXT) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_HASH)) && defined(HTTP_HAVE_PHP_HASH_H)
+# define HTTP_HAVE_HASH
+#endif
+
+#if defined(HAVE_SPL)
+# define HTTP_HAVE_SPL
+#endif
+
PHP_FUNCTION(http_date);
PHP_FUNCTION(http_build_url);
PHP_FUNCTION(http_build_str);
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_put_file);
PHP_FUNCTION(http_put_stream);
PHP_FUNCTION(http_request);
-#ifdef HAVE_CURL_GETFORMDATA
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);