#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
-#define PHP_EXT_HTTP_VERSION "0.23.0dev"
+#define PHP_EXT_HTTP_VERSION "1.4.0"
#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
-# 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
# elif defined(HAVE_NETDB_H)
# define HTTP_HAVE_NETDB
# include <netdb.h>
+# ifdef HAVE_UNISTD_H
+# include <unistd.h>
+# endif
# endif
#endif
# define CURL_STATICLIB
# endif
# include <curl/curl.h>
+# define HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))
#endif
#if defined(HTTP_WANT_MAGIC) && defined(HTTP_HAVE_MAGIC)
#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 {
+ char *ini;
int count;
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;
-#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;
+ zval *server_var;
ZEND_END_MODULE_GLOBALS(http)
#ifdef ZTS
# include "TSRM.h"
-# define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v)
-# define HTTP_GLOBALS ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
+# define HTTP_G ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
#else
-# define HTTP_G(v) (http_globals.v)
-# define HTTP_GLOBALS (&http_globals)
+# define HTTP_G (&http_globals)
+#endif
+
+#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
-#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS
-PHP_FUNCTION(http_test);
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_get_request_body_stream);
PHP_FUNCTION(http_head);
PHP_FUNCTION(http_post_data);
PHP_FUNCTION(http_post_fields);
+PHP_FUNCTION(http_put_data);
PHP_FUNCTION(http_put_file);
PHP_FUNCTION(http_put_stream);
+PHP_FUNCTION(http_request);
+PHP_FUNCTION(http_request_body_encode);
#endif /* HTTP_HAVE_CURL */
PHP_FUNCTION(http_request_method_register);
PHP_FUNCTION(http_request_method_unregister);
#endif
PHP_FUNCTION(http_support);
-PHP_MINIT_FUNCTION(http);
-PHP_MSHUTDOWN_FUNCTION(http);
-PHP_RINIT_FUNCTION(http);
-PHP_RSHUTDOWN_FUNCTION(http);
-PHP_MINFO_FUNCTION(http);
-
#endif /* PHP_HTTP_H */
/*