#include "php_http_request_datashare_api.h"
#include "php_http_request_api.h"
#include "php_http_request_object.h"
+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+# include "php_http_persistent_handle_api.h"
+#endif
-#ifndef HAVE_CURL_SHARE_STRERROR
-# define curl_share_strerror(dummy) "unknown error"
+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+# define HTTP_CURL_SHARE_CTOR(ch) (SUCCESS == http_persistent_handle_acquire("http_request_datashare", &(ch)))
+# define HTTP_CURL_SHARE_DTOR(chp) http_persistent_handle_release("http_request_datashare", (chp))
+# define HTTP_CURL_SLOCK_CTOR(l) (SUCCESS == http_persistent_handle_acquire("http_request_datashare_lock", (void *) &(l)))
+# define HTTP_CURL_SLOCK_DTOR(lp) http_persistent_handle_release("http_request_datashare_lock", (void *) (lp))
+#else
+# define HTTP_CURL_SHARE_CTOR(ch) ((ch) = curl_share_init())
+# define HTTP_CURL_SHARE_DTOR(chp) curl_share_cleanup(*(chp)); *(chp) = NULL
+# define HTTP_CURL_SLOCK_CTOR(l) ((l) = http_request_datashare_locks_init())
+# define HTTP_CURL_SLOCK_DTOR(lp) http_request_datashare_locks_dtor(*(lp)); *(lp) = NULL
#endif
static HashTable http_request_datashare_options;
static int http_request_datashare_compare_handles(void *h1, void *h2);
static void http_request_datashare_destroy_handles(void *el);
#ifdef ZTS
+static void *http_request_datashare_locks_init(void);
+static void http_request_datashare_locks_dtor(void *l);
static void http_request_datashare_lock_func(CURL *handle, curl_lock_data data, curl_lock_access locktype, void *userptr);
static void http_request_datashare_unlock_func(CURL *handle, curl_lock_data data, void *userptr);
#endif
{
curl_lock_data val;
+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+ if (SUCCESS != http_persistent_handle_provide("http_request_datashare", curl_share_init, (http_persistent_handle_dtor) curl_share_cleanup)) {
+ return FAILURE;
+ }
+# ifdef ZTS
+ if (SUCCESS != http_persistent_handle_provide("http_request_datashare_lock", http_request_datashare_locks_init, http_request_datashare_locks_dtor)) {
+ return FAILURE;
+ }
+# endif
+#endif
+
+ if (!http_request_datashare_init_ex(&http_request_datashare_global, 1)) {
+ return FAILURE;
+ }
+
zend_hash_init(&http_request_datashare_options, 4, NULL, NULL, 1);
#define ADD_DATASHARE_OPT(name, opt) \
val = opt; \
ADD_DATASHARE_OPT("ssl", CURL_LOCK_DATA_SSL_SESSION);
ADD_DATASHARE_OPT("connect", CURL_LOCK_DATA_CONNECT);
- http_request_datashare_init_ex(&http_request_datashare_global, 1);
-
return SUCCESS;
}
}
memset(share, 0, sizeof(http_request_datashare));
- HTTP_CHECK_CURL_INIT(share->ch, curl_share_init(), ;);
- if (!share->ch) {
+ if (!HTTP_CURL_SHARE_CTOR(share->ch)) {
if (free_share) {
pefree(share, persistent);
}
}
if (!(share->persistent = persistent)) {
- share->handles = emalloc(sizeof(zend_llist));
- zend_llist_init(share->handles, sizeof(zval *), ZVAL_PTR_DTOR, 0);
+ share->handle.list = emalloc(sizeof(zend_llist));
+ zend_llist_init(share->handle.list, sizeof(zval *), ZVAL_PTR_DTOR, 0);
#ifdef ZTS
} else {
- int i;
-
- share->locks = pecalloc(CURL_LOCK_DATA_LAST, sizeof(http_request_datashare_lock), 1);
- for (i = 0; i < CURL_LOCK_DATA_LAST; ++i) {
- share->locks[i].mx = tsrm_mutex_alloc();
+ if (HTTP_CURL_SLOCK_CTOR(share->handle.locks)) {
+ curl_share_setopt(share->ch, CURLSHOPT_LOCKFUNC, http_request_datashare_lock_func);
+ curl_share_setopt(share->ch, CURLSHOPT_UNLOCKFUNC, http_request_datashare_unlock_func);
+ curl_share_setopt(share->ch, CURLSHOPT_USERDATA, share);
}
- curl_share_setopt(share->ch, CURLSHOPT_LOCKFUNC, http_request_datashare_lock_func);
- curl_share_setopt(share->ch, CURLSHOPT_UNLOCKFUNC, http_request_datashare_unlock_func);
- curl_share_setopt(share->ch, CURLSHOPT_USERDATA, share);
#endif
}
}
}
+ HTTP_CHECK_CURL_INIT(obj->request->ch, http_curl_init_ex(obj->request->ch, obj->request), return FAILURE);
if (CURLE_OK != (rc = curl_easy_setopt(obj->request->ch, CURLOPT_SHARE, share->ch))) {
- http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not attach HttpRequest object(#%d) to the HttpRequestDataShare: %s", Z_OBJ_HANDLE_P(request), curl_share_strerror(rc));
+ http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not attach HttpRequest object(#%d) to the HttpRequestDataShare: %s", Z_OBJ_HANDLE_P(request), curl_easy_strerror(rc));
return FAILURE;
}
PHP_HTTP_API void _http_request_datashare_dtor(http_request_datashare *share TSRMLS_DC)
{
if (!share->persistent) {
- zend_llist_destroy(share->handles);
- efree(share->handles);
+ zend_llist_destroy(share->handle.list);
+ efree(share->handle.list);
}
- curl_share_cleanup(share->ch);
+ HTTP_CURL_SHARE_DTOR(&share->ch);
#ifdef ZTS
if (share->persistent) {
- int i;
-
- for (i = 0; i < CURL_LOCK_DATA_LAST; ++i) {
- tsrm_mutex_free(share->locks[i].mx);
- }
- pefree(share->locks, 1);
+ HTTP_CURL_SLOCK_DTOR(&share->handle.locks);
}
#endif
}
{
zval **r = (zval **) el;
TSRMLS_FETCH();
- getObjectEx(http_request_object, obj, *r);
- curl_easy_setopt(obj->request->ch, CURLOPT_SHARE, NULL);
- zval_ptr_dtor(r);
+ { /* gcc 2.95 needs these braces */
+ getObjectEx(http_request_object, obj, *r);
+
+ curl_easy_setopt(obj->request->ch, CURLOPT_SHARE, NULL);
+ zval_ptr_dtor(r);
+ }
}
#ifdef ZTS
+static void *http_request_datashare_locks_init(void)
+{
+ int i;
+ http_request_datashare_lock *locks = pecalloc(CURL_LOCK_DATA_LAST, sizeof(http_request_datashare_lock), 1);
+
+ if (locks) {
+ for (i = 0; i < CURL_LOCK_DATA_LAST; ++i) {
+ locks[i].mx = tsrm_mutex_alloc();
+ }
+ }
+
+ return locks;
+}
+
+static void http_request_datashare_locks_dtor(void *l)
+{
+ int i;
+ http_request_datashare_lock *locks = (http_request_datashare_lock *) l;
+
+ for (i = 0; i < CURL_LOCK_DATA_LAST; ++i) {
+ tsrm_mutex_free(locks[i].mx);
+ }
+ pefree(locks, 1);
+}
+
static void http_request_datashare_lock_func(CURL *handle, curl_lock_data data, curl_lock_access locktype, void *userptr)
{
http_request_datashare *share = (http_request_datashare *) userptr;
/* TSRM can't distinguish shared/exclusive locks */
- tsrm_mutex_lock(share->locks[data].mx);
- share->locks[data].ch = handle;
+ tsrm_mutex_lock(share->handle.locks[data].mx);
+ share->handle.locks[data].ch = handle;
}
static void http_request_datashare_unlock_func(CURL *handle, curl_lock_data data, void *userptr)
{
http_request_datashare *share = (http_request_datashare *) userptr;
- if (share->locks[data].ch == handle) {
- tsrm_mutex_unlock(share->locks[data].mx);
+ if (share->handle.locks[data].ch == handle) {
+ tsrm_mutex_unlock(share->handle.locks[data].mx);
}
}
#endif
projects / m6w6 / ext-http / blobdiff