| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2011, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
-/* $Id: php_http.h 300300 2010-06-09 07:29:35Z mike $ */
-
#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
#include "php_http_cookie.h"
#include "php_http_encoding.h"
#include "php_http_env.h"
+#include "php_http_env_response.h"
#include "php_http_etag.h"
#include "php_http_exception.h"
-#include "php_http_fluently_callable.h"
#include "php_http_filter.h"
#include "php_http_headers.h"
#include "php_http_info.h"
#include "php_http_request.h"
#include "php_http_curl.h"
#include "php_http_neon.h"
+#include "php_http_serf.h"
#include "php_http_request_method.h"
#include "php_http_request_pool.h"
#include "php_http_url.h"
struct php_http_env_globals env;
struct php_http_persistent_handle_globals persistent_handle;
struct php_http_request_datashare_globals request_datashare;
-#ifdef PHP_HTTP_HAVE_EVENT
- struct php_http_request_pool_globals request_pool;
+#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
+ struct php_http_curl_globals curl;
#endif
ZEND_END_MODULE_GLOBALS(php_http)
#ifdef ZTS
# include "TSRM/TSRM.h"
-# define PHP_HTTP_G ((php_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(php_http_globals_id)])
+# define PHP_HTTP_G ((zend_php_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(php_http_globals_id)])
# undef TSRMLS_FETCH_FROM_CTX
-# define TSRMLS_FETCH_FROM_CTX(ctx) ((ctx)?(ctx):ts_resource_ex(0, NULL))
+# define TSRMLS_FETCH_FROM_CTX(ctx) void ***tsrm_ls = ((ctx)?(ctx):ts_resource_ex(0, NULL))
#else
# define PHP_HTTP_G (&php_http_globals)
#endif