iliaa Tue Dec 26 16:57:51 2006 UTC
Modified files:
/php-src/ext/curl interface.c
Log:
MFB: Fixed bug #39878 (CURL doesn't compile on Sun Studio Pro).
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.104&r2=1.105&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.104 php-src/ext/curl/interface.c:1.105
--- php-src/ext/curl/interface.c:1.104 Tue Dec 19 21:41:12 2006
+++ php-src/ext/curl/interface.c Tue Dec 26 16:57:51 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.104 2006/12/19 21:41:12 mike Exp $ */
+/* $Id: interface.c,v 1.105 2006/12/26 16:57:51 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -156,6 +156,12 @@
#define CAAS(s, v) add_assoc_ascii_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)) &&
\
strncasecmp(str, "file:", sizeof("file:") - 1) == 0)
\
@@ -164,20 +170,18 @@
\
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_url_free(tmp_url);
\
+ php_curl_ret(__ret);
\
}
\
\
if (tmp_url->query || tmp_url->fragment ||
php_check_open_basedir(tmp_url->path TSRMLS_CC)) { \
php_url_free(tmp_url);
\
- RETVAL_FALSE;
\
- return __ret;
\
+ php_curl_ret(__ret);
\
}
\
php_url_free(tmp_url);
\
}-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
