projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fixed HEAD regression always warning about a partial file transfer
[m6w6/ext-http]
/
php_http_api.h
diff --git
a/php_http_api.h
b/php_http_api.h
index 9e0dc6ca69bc39fa7eb80263fbf78a24f56a378a..08b6ba82829520be42d0e8ba15878fb2e3a0a1b1 100644
(file)
--- a/
php_http_api.h
+++ b/
php_http_api.h
@@
-41,9
+41,6
@@
# define PHP_HTTP_API extern
#endif
# define PHP_HTTP_API extern
#endif
-/* make functions that return SUCCESS|FAILURE more obvious */
-typedef int STATUS;
-
#if (defined(HAVE_ICONV) || defined(PHP_HTTP_HAVE_EXT_ICONV)) && (PHP_HTTP_SHARED_DEPS || !defined(COMPILE_DL_ICONV))
# define PHP_HTTP_HAVE_ICONV
#endif
#if (defined(HAVE_ICONV) || defined(PHP_HTTP_HAVE_EXT_ICONV)) && (PHP_HTTP_SHARED_DEPS || !defined(COMPILE_DL_ICONV))
# define PHP_HTTP_HAVE_ICONV
#endif
@@
-52,23
+49,22
@@
typedef int STATUS;
# define PHP_HTTP_HAVE_HASH
#endif
# define PHP_HTTP_HAVE_HASH
#endif
-#if (defined(HAVE_JSON) || defined(PHP_HTTP_HAVE_EXT_JSON)) && (PHP_HTTP_SHARED_DEPS || !defined(COMPILE_DL_JSON))
-# define PHP_HTTP_HAVE_JSON
-#endif
+#include <stddef.h>
#ifdef PHP_WIN32
# define CURL_STATICLIB
#ifdef PHP_WIN32
# define CURL_STATICLIB
-# define PHP_HTTP_HAVE_NETDB
# include <winsock2.h>
# include <winsock2.h>
-#elif defined(HAVE_NETDB_H)
-# define PHP_HTTP_HAVE_NETDB
-# include <netdb.h>
+#else
+# ifdef HAVE_NETDB_H
+# include <netdb.h>
+# endif
# 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
+
+#if defined(HAVE_WCHAR_H) && defined(HAVE_WCTYPE_H) && defined(HAVE_ISWALNUM) && (defined(HAVE_MBRTOWC) || defined(HAVE_MBTOWC))
+# define PHP_HTTP_HAVE_WCHAR 1
#endif
#include <ctype.h>
#endif
#include <ctype.h>
@@
-78,7
+74,6
@@
typedef int STATUS;
#include "php_http.h"
#include "php_http_buffer.h"
#include "php_http.h"
#include "php_http_buffer.h"
-#include "php_http_strlist.h"
#include "php_http_misc.h"
#include "php_http_options.h"
#include "php_http_misc.h"
#include "php_http_options.h"
@@
-111,9
+106,6
@@
typedef int STATUS;
ZEND_BEGIN_MODULE_GLOBALS(php_http)
struct php_http_env_globals env;
ZEND_BEGIN_MODULE_GLOBALS(php_http)
struct php_http_env_globals env;
-#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
- struct php_http_curl_globals curl;
-#endif
ZEND_END_MODULE_GLOBALS(php_http)
ZEND_EXTERN_MODULE_GLOBALS(php_http);
ZEND_END_MODULE_GLOBALS(php_http)
ZEND_EXTERN_MODULE_GLOBALS(php_http);