cvs: php-src /ext/curl interface.c
| From: | Ilia Alshanetsky | Date: | Fri, 12 Mar 2004 17:37:06 +0000 |
| Subject: | cvs: php-src /ext/curl interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-26608@lists.php.net to get a copy of this message | ||
iliaa Fri Mar 12 12:37:06 2004 EDT
Modified files:
/php-src/ext/curl interface.c
Log:
Simplify check.
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.39&r2=1.40&ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.39 php-src/ext/curl/interface.c:1.40
--- php-src/ext/curl/interface.c:1.39 Fri Mar 12 12:31:10 2004
+++ php-src/ext/curl/interface.c Fri Mar 12 12:37:04 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.39 2004/03/12 17:31:10 iliaa Exp $ */
+/* $Id: interface.c,v 1.40 2004/03/12 17:37:04 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -620,16 +620,14 @@
error = call_user_function(EG(function_table), NULL, func, retval, 2, argv TSRMLS_CC);
if (error == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not call the
CURLOPT_PASSWDFUNCTION");
- } else {
- if (Z_TYPE_P(retval) != IS_STRING) {
- if (Z_STRLEN_P(retval) > buflen) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Returned password is too long for libcurl to
handle");
- } else {
- strlcpy(buf, Z_STRVAL_P(retval), Z_STRLEN_P(retval));
- }
+ } else if (Z_TYPE_P(retval) == IS_STRING) {
+ if (Z_STRLEN_P(retval) > buflen) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Returned password is too long for libcurl to
handle");
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "User handler '%s' did not return a
string.", Z_STRVAL_P(func));
+ strlcpy(buf, Z_STRVAL_P(retval), Z_STRLEN_P(retval));
}
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "User handler '%s' did not return a
string.", Z_STRVAL_P(func));
}
zval_ptr_dtor(&argv[0]);