projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge branch 'DEV_2' into HEAD
[m6w6/ext-http]
/
php_http_api.h
diff --git
a/php_http_api.h
b/php_http_api.h
index f48d464dc761289e64f17fe7e389173ef1fbc83d..42d34fca4bfc611f9c72dc942cfacbc1d070fcdc 100644
(file)
--- a/
php_http_api.h
+++ b/
php_http_api.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-201
1
, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-201
3
, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
+--------------------------------------------------------------------+
*/
@@
-23,18
+23,22
@@
#include <php.h>
#include <SAPI.h>
#include <php.h>
#include <SAPI.h>
+#include <ext/raphf/php_raphf.h>
+#include <ext/propro/php_propro.h>
#include <ext/standard/php_string.h>
#include <ext/spl/spl_iterators.h>
#include <ext/date/php_date.h>
#include <zend_interfaces.h>
#include <ext/standard/php_string.h>
#include <ext/spl/spl_iterators.h>
#include <ext/date/php_date.h>
#include <zend_interfaces.h>
+#include <zend_exceptions.h>
+
#ifdef PHP_WIN32
# define PHP_HTTP_API __declspec(dllexport)
#elif defined(__GNUC__) && __GNUC__ >= 4
#ifdef PHP_WIN32
# define PHP_HTTP_API __declspec(dllexport)
#elif defined(__GNUC__) && __GNUC__ >= 4
-# define PHP_HTTP_API __attribute__ ((visibility("default")))
+# define PHP_HTTP_API
extern
__attribute__ ((visibility("default")))
#else
#else
-# define PHP_HTTP_API
+# define PHP_HTTP_API
extern
#endif
/* make functions that return SUCCESS|FAILURE more obvious */
#endif
/* make functions that return SUCCESS|FAILURE more obvious */
@@
-62,6
+66,9
@@
typedef int STATUS;
# ifdef HAVE_UNISTD_H
# include <unistd.h>
# endif
# ifdef HAVE_UNISTD_H
# include <unistd.h>
# endif
+# ifdef HAVE_ERRNO_H
+# include <errno.h>
+# endif
#endif
#include <ctype.h>
#endif
#include <ctype.h>
@@
-73,7
+80,6
@@
typedef int STATUS;
#include "php_http_buffer.h"
#include "php_http_strlist.h"
#include "php_http_misc.h"
#include "php_http_buffer.h"
#include "php_http_strlist.h"
#include "php_http_misc.h"
-#include "php_http_resource_factory.h"
#include "php_http_options.h"
#include "php_http.h"
#include "php_http_options.h"
#include "php_http.h"
@@
-88,32
+94,23
@@
typedef int STATUS;
#include "php_http_exception.h"
#include "php_http_filter.h"
#include "php_http_header_parser.h"
#include "php_http_exception.h"
#include "php_http_filter.h"
#include "php_http_header_parser.h"
-#include "php_http_header
s
.h"
+#include "php_http_header.h"
#include "php_http_message_body.h"
#include "php_http_message_parser.h"
#include "php_http_negotiate.h"
#include "php_http_object.h"
#include "php_http_params.h"
#include "php_http_message_body.h"
#include "php_http_message_parser.h"
#include "php_http_negotiate.h"
#include "php_http_object.h"
#include "php_http_params.h"
-#include "php_http_persistent_handle.h"
-#include "php_http_property_proxy.h"
#include "php_http_querystring.h"
#include "php_http_querystring.h"
-#include "php_http_client_interface.h"
#include "php_http_client.h"
#include "php_http_curl.h"
#include "php_http_client_request.h"
#include "php_http_client_response.h"
#include "php_http_client.h"
#include "php_http_curl.h"
#include "php_http_client_request.h"
#include "php_http_client_response.h"
-#include "php_http_curl_client.h"
-#include "php_http_client_pool.h"
-#include "php_http_curl_client_pool.h"
-#include "php_http_client_datashare.h"
-#include "php_http_curl_client_datashare.h"
-#include "php_http_client_factory.h"
+#include "php_http_client_curl.h"
#include "php_http_url.h"
#include "php_http_version.h"
ZEND_BEGIN_MODULE_GLOBALS(php_http)
struct php_http_env_globals env;
#include "php_http_url.h"
#include "php_http_version.h"
ZEND_BEGIN_MODULE_GLOBALS(php_http)
struct php_http_env_globals env;
- struct php_http_persistent_handle_globals persistent_handle;
#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
struct php_http_curl_globals curl;
#endif
#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
struct php_http_curl_globals curl;
#endif