projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
doh
[m6w6/ext-http]
/
php_http_curl.c
diff --git
a/php_http_curl.c
b/php_http_curl.c
index adf7885a6676246875363224d42fb89e95e15186..91b476c3b5076e15997b5889879441519ef1d335 100644
(file)
--- a/
php_http_curl.c
+++ b/
php_http_curl.c
@@
-10,13
+10,10
@@
+--------------------------------------------------------------------+
*/
+--------------------------------------------------------------------+
*/
-#include "php_http.h"
+#include "php_http
_api
.h"
#if PHP_HTTP_HAVE_CURL
#if PHP_HTTP_HAVE_CURL
-#include "php_http_request.h"
-#include "php_http_request_pool.h"
-
#include <curl/curl.h>
#define PHP_HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))
#include <curl/curl.h>
#define PHP_HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))
@@
-24,10
+21,6
@@
# include <event.h>
#endif
# include <event.h>
#endif
-#include <ext/spl/spl_iterators.h>
-#include <Zend/zend_interfaces.h>
-
-
typedef struct php_http_curl_request {
CURL *handle;
typedef struct php_http_curl_request {
CURL *handle;
@@
-516,6
+509,7
@@
static int php_http_curl_request_pool_socket_callback(CURL *easy, curl_socket_t
case CURL_POLL_REMOVE:
efree(ev);
case CURL_POLL_REMOVE:
efree(ev);
+ /* no break */
case CURL_POLL_NONE:
return 0;
case CURL_POLL_NONE:
return 0;