projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- remove http_compress() and http_uncompress() (deflate/inflate ambiguity)
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index 3a64383772be388346818bb0ec343eb46ceb4ec9..22d97e13846c1e7a8797ea5cac1ff7adf1aa10f4 100644
(file)
--- a/
php_http.h
+++ b/
php_http.h
@@
-22,7
+22,6
@@
#include "phpstr/phpstr.h"
#include "missing.h"
#include "phpstr/phpstr.h"
#include "missing.h"
-
#ifdef HTTP_WANT_NETDB
# ifdef PHP_WIN32
# include <winsock2.h>
#ifdef HTTP_WANT_NETDB
# ifdef PHP_WIN32
# include <winsock2.h>
@@
-34,6
+33,7
@@
#if defined(HTTP_WANT_CURL) && defined(HTTP_HAVE_CURL)
# ifdef PHP_WIN32
# include <winsock2.h>
#if defined(HTTP_WANT_CURL) && defined(HTTP_HAVE_CURL)
# ifdef PHP_WIN32
# include <winsock2.h>
+# define CURL_STATICLIB
# endif
# include <curl/curl.h>
#endif
# endif
# include <curl/curl.h>
#endif
@@
-85,15
+85,6
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
char *allowed;
HashTable custom;
} methods;
char *allowed;
HashTable custom;
} methods;
-
-#ifdef HTTP_HAVE_CURL
- struct _http_globals_request_copies {
- zend_llist strings;
- zend_llist slists;
- zend_llist contexts;
- zend_llist convs;
- } copies;
-#endif /* HTTP_HAVE_CURL */
} request;
#ifdef ZEND_ENGINE_2
} request;
#ifdef ZEND_ENGINE_2
@@
-160,8
+151,6
@@
PHP_FUNCTION(http_gzencode);
PHP_FUNCTION(http_gzdecode);
PHP_FUNCTION(http_deflate);
PHP_FUNCTION(http_inflate);
PHP_FUNCTION(http_gzdecode);
PHP_FUNCTION(http_deflate);
PHP_FUNCTION(http_inflate);
-PHP_FUNCTION(http_compress);
-PHP_FUNCTION(http_uncompress);
#endif
PHP_FUNCTION(http_support);
#endif
PHP_FUNCTION(http_support);