diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2014-05-15 11:50:09 +0200 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2014-05-15 11:50:09 +0200 |
| commit | 17c68b9fd87b6569db299767e497a2a25b273e17 (patch) | |
| tree | 37cf2aad26bb7b6a756d5879de4c3fa9c12e5e29 /ext/curl/interface.c | |
| parent | 5fa4e047b0635a2bd754c9d8b8c9b871776e7e96 (diff) | |
| parent | 08663e910759a59c228dd8d1080e055706df072d (diff) | |
| download | php-git-17c68b9fd87b6569db299767e497a2a25b273e17.tar.gz | |
Merge branch 'phpng' of git.php.net:php-src into phpng
# By Dmitry Stogov (2) and Xinchen Hui (1)
# Via Dmitry Stogov (2) and Xinchen Hui (1)
* 'phpng' of git.php.net:php-src:
Fixed zend_string/char* mess
Refactored ext/xsl, need some help in 3 tests failed
Fixed SoapFault handling
Diffstat (limited to 'ext/curl/interface.c')
| -rw-r--r-- | ext/curl/interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 15e6133fe8..173502877e 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -157,7 +157,7 @@ static void _php_curl_close(zend_resource *rsrc TSRMLS_DC); #define CAAL(s, v) add_assoc_long_ex(return_value, s, sizeof(s) - 1, (long) v); #define CAAD(s, v) add_assoc_double_ex(return_value, s, sizeof(s) - 1, (double) v); #define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s) - 1, (char *) (v ? v : "")); -#define CAASTR(s, v) add_assoc_str_ex(return_value, s, sizeof(s) - 1, v? v : ""); +#define CAASTR(s, v) add_assoc_str_ex(return_value, s, sizeof(s) - 1, v ? v : STR_EMPTY_ALLOC()); #define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s) -1 , (zval *) v); #if defined(PHP_WIN32) || defined(__GNUC__) |