projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- release .24
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index 3c98bd0cda94d31fd1e522641e58462be1c23833..9e67cfac7f0181e739749b91a8937731c89615d3 100644
(file)
--- a/
php_http.h
+++ b/
php_http.h
@@
-15,7
+15,7
@@
#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
-#define PHP_EXT_HTTP_VERSION "0.2
2
.0"
+#define PHP_EXT_HTTP_VERSION "0.2
4
.0"
#ifdef HAVE_CONFIG_H
# include "config.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
@@
-35,7
+35,7
@@
# define HTTP_HAVE_SAPI_RTIME
# define HTTP_GET_REQUEST_TIME() sapi_get_request_time(TSRMLS_C)
# else
# 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)
+# define HTTP_GET_REQUEST_TIME() HTTP_G
->request_time
# endif
# include "SAPI.h"
#endif
# endif
# include "SAPI.h"
#endif
@@
-47,6
+47,9
@@
# elif defined(HAVE_NETDB_H)
# define HTTP_HAVE_NETDB
# include <netdb.h>
# elif defined(HAVE_NETDB_H)
# define HTTP_HAVE_NETDB
# include <netdb.h>
+# ifdef HAVE_UNISTD_H
+# include <unistd.h>
+# endif
# endif
#endif
# endif
#endif
@@
-56,6
+59,7
@@
# define CURL_STATICLIB
# endif
# include <curl/curl.h>
# 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
#if defined(HTTP_WANT_MAGIC) && defined(HTTP_HAVE_MAGIC)
@@
-136,17
+140,15
@@
ZEND_EXTERN_MODULE_GLOBALS(http);
#ifdef ZTS
# include "TSRM.h"
#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
#else
-# define HTTP_G(v) (http_globals.v)
-# define HTTP_GLOBALS (&http_globals)
+# define HTTP_G (&http_globals)
#endif
#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_test);
PHP_FUNCTION(http_date);
PHP_FUNCTION(http_build_url);
+PHP_FUNCTION(http_build_str);
PHP_FUNCTION(http_negotiate_language);
PHP_FUNCTION(http_negotiate_charset);
PHP_FUNCTION(http_negotiate_content_type);
PHP_FUNCTION(http_negotiate_language);
PHP_FUNCTION(http_negotiate_charset);
PHP_FUNCTION(http_negotiate_content_type);
@@
-183,9
+185,6
@@
PHP_FUNCTION(http_request_method_register);
PHP_FUNCTION(http_request_method_unregister);
PHP_FUNCTION(http_request_method_exists);
PHP_FUNCTION(http_request_method_name);
PHP_FUNCTION(http_request_method_unregister);
PHP_FUNCTION(http_request_method_exists);
PHP_FUNCTION(http_request_method_name);
-#ifndef ZEND_ENGINE_2
-PHP_FUNCTION(http_build_query);
-#endif /* ZEND_ENGINE_2 */
PHP_FUNCTION(ob_etaghandler);
#ifdef HTTP_HAVE_ZLIB
PHP_FUNCTION(http_deflate);
PHP_FUNCTION(ob_etaghandler);
#ifdef HTTP_HAVE_ZLIB
PHP_FUNCTION(http_deflate);