/* $Id$ */
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <ctype.h>
-#if defined(HAVE_CURL) && HAVE_CURL
-# ifdef PHP_WIN32
-# include <winsock2.h>
-# include <sys/types.h>
-# endif
-#include <curl/curl.h>
-#include <curl/easy.h>
-#endif
-
#include "php.h"
#include "php_version.h"
#include "php_streams.h"
#include "php_http.h"
#include "php_http_api.h"
+#ifdef HTTP_HAVE_CURL
+
+#ifdef PHP_WIN32
+#include <winsock2.h>
+#include <sys/types.h>
+#endif
+
+#include <curl/curl.h>
+#include <curl/easy.h>
+#endif
+
+
ZEND_DECLARE_MODULE_GLOBALS(http)
/* {{{ day/month names */
static int check_tzone(char *tzone);
/* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
#define http_curl_initbuf(m) _http_curl_initbuf((m) TSRMLS_CC)
static inline void _http_curl_initbuf(http_curlbuf_member member TSRMLS_DC);
#define http_curl_freebuf(m) _http_curl_freebuf((m) TSRMLS_CC)
/* }}} */
/* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
/* {{{ static inline void http_curl_initbuf(http_curlbuf_member) */
static inline void _http_curl_initbuf(http_curlbuf_member member TSRMLS_DC)
curl_easy_setopt(ch, CURLOPT_AUTOREFERER, 1);
curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, http_curl_body_callback);
curl_easy_setopt(ch, CURLOPT_HEADERFUNCTION, http_curl_hdrs_callback);
-#if defined(ZTS)
+#ifdef ZTS
curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1);
#endif
-#if defined(PHP_DEBUG)
- curl_easy_setopt(ch, CURLOPT_VERBOSE, 1);
-#endif
if ((!options) || (1 > zend_hash_num_elements(options))) {
return;
chr_ptr = 0;
}
retval = (t <= http_parse_date(modified));
-#if defined(PHP_DEBUG)
- fprintf(stderr,
- "\nComparing Last-Modified %s(%s)==%d:\n\t%d\n\t%d\n\n",
- get_active_function_name(TSRMLS_C), entry, retval, t,
- http_parse_date(modified));
-#endif
efree(modified);
return retval;
}
} else {
result = (NULL != strstr(Z_STRVAL_P(zetag), quoted_etag));
}
-#if defined(PHP_DEBUG)
- fprintf(stderr,
- "\nComparing E-Tag %s(%s)==%d:\n\t<%s>\n\t<%s>\n\n",
- get_active_function_name(TSRMLS_C), entry, result,
- Z_STRVAL_P(zetag), quoted_etag);
-#endif
efree(quoted_etag);
return result;
}
/* }}} */
/* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
/* {{{ STATUS http_get(char *, HashTable *, HashTable *, char **, size_t *) */
PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options,