-
-#include "php_http.h"
-#include "php_http_request.h"
-#include "php_http_request_pool.h"
+/*
+ +--------------------------------------------------------------------+
+ | 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-2011, Michael Wallner <mike@php.net> |
+ +--------------------------------------------------------------------+
+*/
+
+#include "php_http_api.h"
+
+#if PHP_HTTP_HAVE_CURL
#include <curl/curl.h>
#define PHP_HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
# include <event.h>
#endif
-#include <ext/spl/spl_iterators.h>
-#include <Zend/zend_interfaces.h>
-
-
typedef struct php_http_curl_request {
CURL *handle;
int unfinished; /* int because of curl_multi_perform() */
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
struct event *timeout;
unsigned useevents:1;
unsigned runsocket:1;
}
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
typedef struct php_http_request_pool_event {
struct event evnt;
ev = ecalloc(1, sizeof(php_http_request_pool_event_t));
ev->pool = pool;
curl_multi_assign(curl->handle, sock, ev);
- event_base_set(PHP_HTTP_G->request_pool.event_base, &ev->evnt);
+ event_base_set(PHP_HTTP_G->curl.event_base, &ev->evnt);
} else {
event_del(&ev->evnt);
}
case CURL_POLL_REMOVE:
efree(ev);
+ /* no break */
case CURL_POLL_NONE:
return 0;
if (!event_initialized(curl->timeout)) {
event_set(curl->timeout, -1, 0, php_http_curl_request_pool_timeout_callback, pool);
- event_base_set(PHP_HTTP_G->request_pool.event_base, curl->timeout);
+ event_base_set(PHP_HTTP_G->curl.event_base, curl->timeout);
} else if (event_pending(curl->timeout, EV_TIMEOUT, NULL)) {
event_del(curl->timeout);
}
zval *urlenc_cookies = NULL;
/* check whether cookies should not be urlencoded; default is to urlencode them */
if ((!(urlenc_cookies = get_option(&curl->options.cache, options, ZEND_STRS("encodecookies"), IS_BOOL))) || Z_BVAL_P(urlenc_cookies)) {
- if (SUCCESS == php_http_url_encode_hash_recursive(HASH_OF(zoption), &curl->options.cookies, "; ", lenof("; "), NULL, 0 TSRMLS_CC)) {
+ if (SUCCESS == php_http_url_encode_hash_ex(HASH_OF(zoption), &curl->options.cookies, ZEND_STRS(";"), ZEND_STRS("="), NULL, 0 TSRMLS_CC)) {
php_http_buffer_fix(&curl->options.cookies);
curl_easy_setopt(ch, CURLOPT_COOKIE, curl->options.cookies.data);
}
php_http_curl_request_pool_t *curl = h->ctx;
TSRMLS_FETCH_FROM_CTX(h->ts);
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
if (curl->timeout) {
efree(curl->timeout);
curl->timeout = NULL;
struct timeval timeout;
php_http_curl_request_pool_t *curl = h->ctx;
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
if (curl->useevents) {
TSRMLS_FETCH_FROM_CTX(h->ts);
static int php_http_curl_request_pool_once(php_http_request_pool_t *h)
{
php_http_curl_request_pool_t *curl = h->ctx;
- TSRMLS_FETCH_FROM_CTX(h->ts);
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
if (curl->useevents) {
+ TSRMLS_FETCH_FROM_CTX(h->ts);
php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "not implemented");
return FAILURE;
}
return curl->unfinished;
}
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
static void dolog(int i, const char *m) {
fprintf(stderr, "%d: %s\n", i, m);
}
{
TSRMLS_FETCH_FROM_CTX(h->ts);
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
php_http_curl_request_pool_t *curl = h->ctx;
if (curl->useevents) {
#if DBG_EVENTS
fprintf(stderr, "X");
#endif
- event_base_dispatch(PHP_HTTP_G->request_pool.event_base);
+ event_base_dispatch(PHP_HTTP_G->curl.event_base);
} while (curl->unfinished);
} else
#endif
PHP_RINIT_FUNCTION(http_curl)
{
-#ifdef PHP_HTTP_HAVE_EVENT
- if (!PHP_HTTP_G->request_pool.event_base && !(PHP_HTTP_G->request_pool.event_base = event_init())) {
+#if PHP_HTTP_HAVE_EVENT
+ if (!PHP_HTTP_G->curl.event_base && !(PHP_HTTP_G->curl.event_base = event_init())) {
return FAILURE;
}
#endif
return SUCCESS;
}
+
+#endif /* PHP_HTTP_HAVE_CURL */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+