/*
- +----------------------------------------------------------------------+
- | PECL :: http |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, that |
- | is bundled with this package in the file LICENSE, and is available |
- | through the world-wide-web at http://www.php.net/license/3_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Copyright (c) 2004-2005 Michael Wallner <mike@php.net> |
- +----------------------------------------------------------------------+
+ +--------------------------------------------------------------------+
+ | PECL :: http |
+ +--------------------------------------------------------------------+
+ | Redistribution and use in source and binary forms, with or without |
+ | modification, are permitted provided that the conditions mentioned |
+ | in the accompanying LICENSE file are met. |
+ +--------------------------------------------------------------------+
+ | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ +--------------------------------------------------------------------+
*/
/* $Id$ */
#include <curl/curl.h>
-/*
- * cruft for thread safe SSL crypto locks
- */
+/* {{{ cruft for thread safe SSL crypto locks */
#if defined(ZTS) && defined(HTTP_HAVE_SSL)
# ifdef PHP_WIN32
# define HTTP_NEED_SSL_TSL
# endif /* HTTP_HAVE_OPENSSL || HTTP_HAVE_GNUTLS */
# endif /* PHP_WIN32 */
#endif /* ZTS && HTTP_HAVE_SSL */
+/* }}} */
ZEND_EXTERN_MODULE_GLOBALS(http);
char *key = NULL;
ulong idx;
zval **data;
+ HashPosition pos;
struct curl_httppost *http_post_data[2] = {NULL, NULL};
/* normal data */
- FOREACH_HASH_KEYVAL(fields, key, idx, data) {
+ FOREACH_HASH_KEYVAL(pos, fields, key, idx, data) {
CURLcode err;
if (key) {
+ zval *orig = *data;
+
convert_to_string_ex(data);
err = curl_formadd(&http_post_data[0], &http_post_data[1],
CURLFORM_COPYNAME, key,
CURLFORM_CONTENTSLENGTH, (long) Z_STRLEN_PP(data),
CURLFORM_END
);
+
+ if (orig != *data) {
+ zval_ptr_dtor(data);
+ }
+
if (CURLE_OK != err) {
http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not encode post fields: %s", curl_easy_strerror(err));
curl_formfree(http_post_data[0]);
}
/* file data */
- FOREACH_HASH_VAL(files, data) {
+ FOREACH_HASH_VAL(pos, files, data) {
zval **file, **type, **name;
- if ( SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "name", sizeof("name"), (void **) &name) ||
- SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &type) ||
- SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "file", sizeof("file"), (void **) &file)) {
+ if (Z_TYPE_PP(data) != IS_ARRAY) {
+ http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Unrecognized type of post file array entry");
+ } else if ( SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "name", sizeof("name"), (void **) &name) ||
+ SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &type) ||
+ SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "file", sizeof("file"), (void **) &file)) {
http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry");
} else {
CURLcode err = curl_formadd(&http_post_data[0], &http_post_data[1],
if (zoption = http_curl_getopt(options, "headers", IS_ARRAY)) {
char *header_key;
ulong header_idx;
+ HashPosition pos;
struct curl_slist *headers = NULL;
- FOREACH_KEY(zoption, header_key, header_idx) {
+ FOREACH_KEY(pos, zoption, header_key, header_idx) {
if (header_key) {
zval **header_val;
- if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val)) {
+ if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &header_val, &pos)) {
char header[1024] = {0};
snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val));
headers = curl_slist_append(headers, http_request_data_copy(COPY_STRING, header));
if (zoption = http_curl_getopt(options, "cookies", IS_ARRAY)) {
char *cookie_key = NULL;
ulong cookie_idx = 0;
+ HashPosition pos;
phpstr *qstr = phpstr_new();
- FOREACH_KEY(zoption, cookie_key, cookie_idx) {
+ FOREACH_KEY(pos, zoption, cookie_key, cookie_idx) {
if (cookie_key) {
zval **cookie_val;
- if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &cookie_val)) {
+ if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &cookie_val, &pos)) {
phpstr_appendf(qstr, "%s=%s; ", cookie_key, Z_STRVAL_PP(cookie_val));
}
ulong idx;
char *key = NULL;
zval **param;
+ HashPosition pos;
- FOREACH_KEYVAL(zoption, key, idx, param) {
+ FOREACH_KEYVAL(pos, zoption, key, idx, param) {
if (key) {
HTTP_CURL_OPT_SSL_STRING(CERT);
#if LIBCURL_VERSION_NUM >= 0x070903
{
HTTP_REQUEST_CALLBACK_DATA(ctx, http_request_conv *, conv);
-#if 0
- fprintf(stderr, "DEBUG: %s\n", data);
-#endif
-
switch (type)
{
case CURLINFO_DATA_IN:
phpstr_append(conv->request, data, length);
}
break;
+#if 0
+ default:
+ fprintf(stderr, "## ", type);
+ if (!type) {
+ fprintf(stderr, "%s", data);
+ } else {
+ ulong i;
+ for (i = 1; i <= length; ++i) {
+ fprintf(stderr, "%02X ", data[i-1] & 0xFF);
+ if (!(i % 20)) {
+ fprintf(stderr, "\n## ");
+ }
+ }
+ fprintf(stderr, "\n");
+ }
+ if (data[length-1] != 0xa) {
+ fprintf(stderr, "\n");
+ }
+ break;
+#endif
}
if (type) {
/* }}} */
#ifdef HTTP_NEED_OPENSSL_TSL
-
-static MUTEX_T *http_ssl_mutex = NULL;
+/* {{{ */
+static MUTEX_T *http_openssl_tsl = NULL;
static void http_ssl_lock(int mode, int n, const char * file, int line)
{
if (mode & CRYPTO_LOCK) {
- tsrm_mutex_lock(http_ssl_mutex[n]);
+ tsrm_mutex_lock(http_openssl_tsl[n]);
} else {
- tsrm_mutex_unlock(http_ssl_mutex[n]);
+ tsrm_mutex_unlock(http_openssl_tsl[n]);
}
}
-static unsigned long http_ssl_id(void)
+static ulong http_ssl_id(void)
{
- return (unsigned long) tsrm_thread_id();
+ return (ulong) tsrm_thread_id();
}
static inline void http_ssl_init(void)
{
int i, c = CRYPTO_num_locks();
- http_ssl_mutex = malloc(c * sizeof(MUTEX_T));
+ http_openssl_tsl = malloc(c * sizeof(MUTEX_T));
for (i = 0; i < c; ++i) {
- http_ssl_mutex[i] = tsrm_mutex_alloc();
+ http_openssl_tsl[i] = tsrm_mutex_alloc();
}
CRYPTO_set_id_callback(http_ssl_id);
static inline void http_ssl_cleanup(void)
{
- if (http_ssl_mutex) {
+ if (http_openssl_tsl) {
int i, c = CRYPTO_num_locks();
CRYPTO_set_id_callback(NULL);
CRYPTO_set_locking_callback(NULL);
for (i = 0; i < c; ++i) {
- tsrm_mutex_free(http_ssl_mutex[i]);
+ tsrm_mutex_free(http_openssl_tsl[i]);
}
- free(http_ssl_mutex);
- http_ssl_mutex = NULL;
+ free(http_openssl_tsl);
+ http_openssl_tsl = NULL;
}
}
#endif /* HTTP_NEED_OPENSSL_TSL */
+/* }}} */
#ifdef HTTP_NEED_GNUTLS_TSL
-
+/* {{{ */
static int http_ssl_mutex_create(void **m)
{
- if (*((MUTEX_T **) m) = tsrm_mutex_alloc()) {
+ if (*((MUTEX_T *) m) = tsrm_mutex_alloc()) {
return SUCCESS;
} else {
return FAILURE;
static int http_ssl_mutex_destroy(void **m)
{
- tsrm_mutex_free(*((MUTEX_T **) m));
+ tsrm_mutex_free(*((MUTEX_T *) m));
return SUCCESS;
}
static int http_ssl_mutex_lock(void **m)
{
- return tsrm_mutex_lock(*((MUTEX_T **) m));
+ return tsrm_mutex_lock(*((MUTEX_T *) m));
}
static int http_ssl_mutex_unlock(void **m)
{
- return tsrm_mutex_unlock(*((MUTEX_T **) m));
+ return tsrm_mutex_unlock(*((MUTEX_T *) m));
}
-static struct gcry_thread_cbs http_ssl_callbacks = {
+static struct gcry_thread_cbs http_gnutls_tsl = {
GCRY_THREAD_OPTIONS_USER,
NULL,
http_ssl_mutex_create,
static inline void http_ssl_init(void)
{
- gcry_control(GCRYCTL_SET_THREAD_CBS, &http_ssl_callbacks);
+ gcry_control(GCRYCTL_SET_THREAD_CBS, &http_gnutls_tsl);
}
static inline void http_ssl_cleanup(void)
{
return;
}
-
#endif /* HTTP_NEED_GNUTLS_TSL */
+/* }}} */
+/* {{{ http_curl_defaults(CURL *) */
static inline void _http_curl_defaults(CURL *ch)
{
HTTP_CURL_OPT(URL, NULL);
HTTP_CURL_OPT(READDATA, NULL);
HTTP_CURL_OPT(INFILESIZE, 0);
}
+/* }}} */
#endif /* HTTP_HAVE_CURL */
projects / m6w6 / ext-http / blobdiff