X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=8ca7c730ba7f2c6f5c6b61899a0607d925a41416;hp=cf3e15fe97b07c251e6a8910c33049accc98684e;hb=302498d96ed22a09da4375bd955d07f04b6b36c4;hpb=6b07ab3988f234f92d537e865648e823217d6575 diff --git a/php_http_std_defs.h b/php_http_std_defs.h index cf3e15f..8ca7c73 100644 --- a/php_http_std_defs.h +++ b/php_http_std_defs.h @@ -231,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) @@ -259,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 @@ -368,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