diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-12-26 16:55:56 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-12-26 16:55:56 +0000 |
| commit | 5e576be36f541e97ba718f65cdbc7753d2ebcd53 (patch) | |
| tree | 2bf2143d3a3f08b8e5b594c1cd0a3677f5942db6 /ext/curl/interface.c | |
| parent | ffd41a503fc59583d294b889ffd0bdc55a3fd662 (diff) | |
| download | php-git-5e576be36f541e97ba718f65cdbc7753d2ebcd53.tar.gz | |
Fixed bug #39878 (CURL doesn't compile on Sun Studio Pro).
Diffstat (limited to 'ext/curl/interface.c')
| -rw-r--r-- | ext/curl/interface.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 54e5f46e2c..2ec184dd47 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -156,6 +156,12 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC); #define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s), (char *) v, 1); #define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v); +#if defined(PHP_WIN32) || defined(__GNUC__) + #define php_curl_ret(__ret) RETVAL_FALSE; return __ret; +#else + #define php_curl_ret(__ret) RETVAL_FALSE; return; +#endif + #define PHP_CURL_CHECK_OPEN_BASEDIR(str, len, __ret) \ if (((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) && \ strncasecmp(str, "file:", sizeof("file:") - 1) == 0) \ @@ -164,22 +170,19 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC); \ if (!(tmp_url = php_url_parse_ex(str, len))) { \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL '%s'", str); \ - RETVAL_FALSE; \ - return __ret; \ - } \ + php_curl_ret(__ret); \ + } \ \ if (php_memnstr(str, tmp_url->path, strlen(tmp_url->path), str + len)) { \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "URL '%s' contains unencoded control characters.", str); \ - RETVAL_FALSE; \ - return __ret; \ + php_curl_ret(__ret); \ } \ \ if (tmp_url->query || tmp_url->fragment || php_check_open_basedir(tmp_url->path TSRMLS_CC) || \ (PG(safe_mode) && !php_checkuid(tmp_url->path, "rb+", CHECKUID_CHECK_MODE_PARAM)) \ ) { \ php_url_free(tmp_url); \ - RETVAL_FALSE; \ - return __ret; \ + php_curl_ret(__ret); \ } \ php_url_free(tmp_url); \ } |