Made client's once & wait methods availabel when using events

diff --git a/package.xml b/package.xml
index 8c74393422927b714c93b97e06db0a6b3da7b8df..a4e1b4e6b771c7faf39f1709de877ef90b60cf4f 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -50,6 +50,7 @@ v2: http://dev.iworks.at/ext-http/lcov/ext/http/
  <notes><![CDATA[
 - var_dump(http\Message) no longer automatically creates an empty body
 + Added http\Message\Parser class
  <notes><![CDATA[
 - var_dump(http\Message) no longer automatically creates an empty body
 + Added http\Message\Parser class

++ Made http\Client::once() and http\Client::wait() available when using events

 ]]></notes>
  <contents>
   <dir name="/">
 ]]></notes>
  <contents>
   <dir name="/">

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index db73a3141bae70b393661f732f8cf2eebf2c1571..b261a34112b4f93a0f1f78d5828b135fa585d037 100644 (file)
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -783,8 +783,6 @@ static void php_http_curlm_timer_callback(CURLM *multi, long timeout_ms, void *t
 
                        if (!event_initialized(curl->timeout)) {
                                event_assign(curl->timeout, curl->evbase, CURL_SOCKET_TIMEOUT, 0, php_http_curlm_timeout_callback, context);
 
                        if (!event_initialized(curl->timeout)) {
                                event_assign(curl->timeout, curl->evbase, CURL_SOCKET_TIMEOUT, 0, php_http_curlm_timeout_callback, context);

-                       } else if (event_pending(curl->timeout, EV_TIMEOUT, NULL)) {
-                               event_del(curl->timeout);

                        }
 
                        timeout.tv_sec = timeout_ms / 1000;
                        }
 
                        timeout.tv_sec = timeout_ms / 1000;


@@ -1873,6 +1871,17 @@ static void php_http_client_curl_reset(php_http_client_t *h)
        }
 }
 
        }
 }
 

+static inline void php_http_client_curl_get_timeout(php_http_client_curl_t *curl, long max_tout, struct timeval *timeout)
+{
+       if ((CURLM_OK == curl_multi_timeout(curl->handle, &max_tout)) && (max_tout > 0)) {
+               timeout->tv_sec = max_tout / 1000;
+               timeout->tv_usec = (max_tout % 1000) * 1000;
+       } else {
+               timeout->tv_sec = 0;
+               timeout->tv_usec = 1000;
+       }
+}
+

 #ifdef PHP_WIN32
 #      define SELECT_ERROR SOCKET_ERROR
 #else
 #ifdef PHP_WIN32
 #      define SELECT_ERROR SOCKET_ERROR
 #else


@@ -1888,10 +1897,18 @@ static STATUS php_http_client_curl_wait(php_http_client_t *h, struct timeval *cu
 
 #if PHP_HTTP_HAVE_EVENT
        if (curl->useevents) {
 
 #if PHP_HTTP_HAVE_EVENT
        if (curl->useevents) {

-               TSRMLS_FETCH_FROM_CTX(h->ts);
+               if (!event_initialized(curl->timeout)) {
+                       event_assign(curl->timeout, curl->evbase, CURL_SOCKET_TIMEOUT, 0, php_http_curlm_timeout_callback, h);
+               } else if (custom_timeout && timerisset(custom_timeout)) {
+                       event_add(curl->timeout, custom_timeout);
+               } else if (!event_pending(curl->timeout, EV_TIMEOUT, NULL)) {
+                       php_http_client_curl_get_timeout(curl, 1000, &timeout);
+                       event_add(curl->timeout, &timeout);
+               }

 
 

-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "not implemented");
-               return FAILURE;
+               event_base_loop(curl->evbase, EVLOOP_ONCE);
+
+               return SUCCESS;

        }
 #endif
 
        }
 #endif
 


@@ -1903,15 +1920,7 @@ static STATUS php_http_client_curl_wait(php_http_client_t *h, struct timeval *cu
                if (custom_timeout && timerisset(custom_timeout)) {
                        timeout = *custom_timeout;
                } else {
                if (custom_timeout && timerisset(custom_timeout)) {
                        timeout = *custom_timeout;
                } else {

-                       long max_tout = 1000;
-
-                       if ((CURLM_OK == curl_multi_timeout(curl->handle, &max_tout)) && (max_tout > 0)) {
-                               timeout.tv_sec = max_tout / 1000;
-                               timeout.tv_usec = (max_tout % 1000) * 1000;
-                       } else {
-                               timeout.tv_sec = 0;
-                               timeout.tv_usec = 1000;
-                       }
+                       php_http_client_curl_get_timeout(curl, 1000, &timeout);

                }
 
                if (MAX == -1) {
                }
 
                if (MAX == -1) {


@@ -1930,12 +1939,9 @@ static int php_http_client_curl_once(php_http_client_t *h)
 
 #if PHP_HTTP_HAVE_EVENT
        if (curl->useevents) {
 
 #if PHP_HTTP_HAVE_EVENT
        if (curl->useevents) {

-               TSRMLS_FETCH_FROM_CTX(h->ts);
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "not implemented");
-               return FAILURE;
-       }
+               event_base_loop(curl->evbase, EVLOOP_NONBLOCK);
+       } else

 #endif
 #endif

-

        while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(curl->handle, &curl->unfinished));
 
        php_http_curlm_responsehandler(h);
        while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(curl->handle, &curl->unfinished));
 
        php_http_curlm_responsehandler(h);