- move some definitions around

[m6w6/ext-http] / php_http_std_defs.h

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index f85198344526459e7aa2dab1d04c9caa627a8de8..8ca7c730ba7f2c6f5c6b61899a0607d925a41416 100644 (file)
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -93,10 +93,7 @@ typedef int STATUS;
        }
 
 /* function accepts no args */
-#define NO_ARGS \
-       if (ZEND_NUM_ARGS()) { \
-               zend_error(E_NOTICE, "Wrong parameter count for %s()", get_active_function_name(TSRMLS_C)); \
-       }
+#define NO_ARGS zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "");
 
 /* CR LF */
 #define HTTP_CRLF "\r\n"
@@ -111,7 +108,7 @@ typedef int STATUS;
 #define HTTP_URL_ARGSEP "&"
 
 /* send buffer size */
-#define HTTP_SENDBUF_SIZE 40960
+#define HTTP_SENDBUF_SIZE 8000 /*40960*/
 
 /* CURL buffer size */
 #define HTTP_CURLBUF_SIZE 16384
@@ -234,7 +231,6 @@ typedef int STATUS;
 #      define ACC_PROP_PUBLIC(flags)                   (flags & ZEND_ACC_PUBLIC)
 #      define ACC_PROP(ce, flags)                              (ACC_PROP_PUBLIC(flags) || ACC_PROP_PRIVATE(ce, flags) || ACC_PROP_PROTECTED(ce, flags))
 
-#      define SET_EH_THROW() SET_EH_THROW_EX(zend_exception_get_default())
 #      define SET_EH_THROW_HTTP() SET_EH_THROW_EX(http_exception_get_default())
 #      define SET_EH_THROW_EX(ex) php_set_error_handling(EH_THROW, ex TSRMLS_CC)
 #      define SET_EH_NORMAL() php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC)
@@ -262,6 +258,10 @@ typedef int STATUS;
 #      define  ZEND_EXCEPTION_GET_DEFAULT() zend_exception_get_default()
 #endif
 
+#if PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION < 10
+#      define php_url_parse_ex(u, l) php_url_parse(u)
+#endif
+
 #ifndef E_THROW
 #      define E_THROW 0
 #endif
@@ -371,6 +371,16 @@ typedef int STATUS;
 #endif /* HTTP_HAVE_CURL */
 
 
+#ifndef HAVE_CURL_SHARE_STRERROR
+#      define curl_share_strerror(dummy) "unknown error"
+#endif
+#ifndef HAVE_CURL_EASY_STRERROR
+#      define curl_easy_strerror(dummy) "unknown error"
+#endif
+#ifndef HAVE_CURL_MULTI_STRERROR
+#      define curl_multi_strerror(dummy) "unknown error"
+#endif
+
 #ifndef TSRMLS_FETCH_FROM_CTX
 #      ifdef ZTS
 #              define TSRMLS_FETCH_FROM_CTX(ctx)       void ***tsrm_ls = (void ***) ctx