- E_THROW for PHP4 too

[m6w6/ext-http] / php_http_std_defs.h

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index e79a9b0be29dd9d6dfef22aec7c8aa3e867692eb..03911a83a02a3eba670a1e2f72c5e497fc08c8bd 100644 (file)
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -34,7 +34,10 @@ typedef int STATUS;
 #define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v))
 
 /* function accepts no args */
-#define NO_ARGS if (ZEND_NUM_ARGS()) WRONG_PARAM_COUNT
+#define NO_ARGS \
+       if (ZEND_NUM_ARGS()) { \
+               zend_error(E_NOTICE, "Wrong parameter count for %s()", get_active_function_name(TSRMLS_C)); \
+       }
 
 /* CR LF */
 #define HTTP_CRLF "\r\n"
@@ -137,9 +140,26 @@ typedef int STATUS;
                } \
        }
 
+#      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)
+
 #endif /* ZEND_ENGINE_2 */
 /* }}} */
 
+#ifndef E_THROW
+#      define E_THROW 0
+#endif
+
+#define HTTP_E_UNKOWN          0L
+#define HTTP_E_PARSE           1L
+#define HTTP_E_HEADER          2L
+#define HTTP_E_OBUFFER         3L
+#define HTTP_E_CURL                    4L
+#define HTTP_E_ENCODE          5L
+#define HTTP_E_PARAM           6L
+#define HTTP_E_URL                     7L
 
 #endif /* PHP_HTTP_STD_DEFS_H */