iliaa Tue Dec 26 16:55:56 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
/php-src NEWS
Log:
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.62.2.14.2.16&r2=1.62.2.14.2.17&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.16
php-src/ext/curl/interface.c:1.62.2.14.2.17
--- php-src/ext/curl/interface.c:1.62.2.14.2.16 Tue Dec 19 21:41:25 2006
+++ php-src/ext/curl/interface.c Tue Dec 26 16:55:56 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.16 2006/12/19 21:41:25 mike Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.17 2006/12/26 16:55:56 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -156,6 +156,12 @@
#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 @@
\
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);
\
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.462&r2=1.2027.2.547.2.463&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.462 php-src/NEWS:1.2027.2.547.2.463
--- php-src/NEWS:1.2027.2.547.2.462 Tue Dec 26 09:52:04 2006
+++ php-src/NEWS Tue Dec 26 16:55:56 2006
@@ -29,6 +29,7 @@
install path). (Tony)
- Fixed bug #39884 (ReflectionParameter::getClass() throws exception for type
hint self). (thekid at php dot net)
+- Fixed bug #39878 (CURL doesn't compile on Sun Studio Pro). (Ilia)
- Fixed bug #39873 (number_format() breaks with locale & decimal points).
(Ilia)
- Fixed bug #39869 (safe_read does not initialize errno).-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
