| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2007, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
# include <openssl/crypto.h>
# else /* !PHP_WIN32 */
# if defined(HTTP_HAVE_OPENSSL)
-# if defined(HAVE_OPENSSL_CRYPTO_H)
-# define HTTP_NEED_OPENSSL_TSL
-# include <openssl/crypto.h>
-# else
-# warning \
- "libcurl was compiled with OpenSSL support, but configure could not find " \
- "openssl/crypto.h; thus no SSL crypto locking callbacks will be set, which may " \
- "cause random crashes on SSL requests"
-# endif
+# define HTTP_NEED_OPENSSL_TSL
+# include <openssl/crypto.h>
# elif defined(HTTP_HAVE_GNUTLS)
-# if defined(HAVE_GCRYPT_H)
-# define HTTP_NEED_GNUTLS_TSL
-# include <gcrypt.h>
-# else
-# warning \
- "libcurl was compiled with GnuTLS support, but configure could not find " \
- "gcrypt.h; thus no SSL crypto locking callbacks will be set, which may " \
- "cause random crashes on SSL requests"
-# endif
+# define HTTP_NEED_GNUTLS_TSL
+# include <gcrypt.h>
# else
# warning \
"libcurl was compiled with SSL support, but configure could not determine which" \
# endif /* PHP_WIN32 */
#endif /* ZTS && HTTP_HAVE_SSL */
-#ifndef HAVE_CURL_EASY_STRERROR
-# define curl_easy_strerror(dummy) "unknown error"
-#endif
-
#define HTTP_CURL_OPT(OPTION, p) curl_easy_setopt((request->ch), OPTION, (p))
#define HTTP_CURL_OPT_STRING(OPTION, ldiff, obdc) \
}
#define HTTP_CURL_OPT_STRING_EX(keyname, optname, obdc) \
if (!strcasecmp(key.str, keyname)) { \
- zval *copy = http_request_option_cache_ex(request, keyname, strlen(keyname)+1, 0, zval_copy(IS_STRING, *param)); \
+ zval *copy = http_request_option_cache_ex(request, keyname, strlen(keyname)+1, 0, http_zsep(IS_STRING, *param)); \
if (obdc) { \
HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(copy), return FAILURE); \
} \
HTTP_CURL_OPT(optname, Z_STRVAL_P(copy)); \
+ zval_ptr_dtor(©); \
continue; \
}
#define HTTP_CURL_OPT_LONG(OPTION, ldiff) \
}
#define HTTP_CURL_OPT_LONG_EX(keyname, optname) \
if (!strcasecmp(key.str, keyname)) { \
- zval *copy = zval_copy(IS_LONG, *param); \
+ zval *copy = http_zsep(IS_LONG, *param); \
HTTP_CURL_OPT(optname, Z_LVAL_P(copy)); \
- zval_free(©); \
+ zval_ptr_dtor(©); \
continue; \
}