projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
* renaming tests
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index c4fc38050873776aad9c82ded570cd42c8fd410f..ea2c2559e0262b81f666cb6f131567ac84d53996 100644
(file)
--- a/
php_http.h
+++ b/
php_http.h
@@
-18,7
+18,7
@@
#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
-#define PHP_EXT_HTTP_VERSION "0.
5
.0-dev"
+#define PHP_EXT_HTTP_VERSION "0.
7
.0-dev"
/* make compile on Win32 */
#include "php_streams.h"
/* make compile on Win32 */
#include "php_streams.h"
@@
-34,17
+34,32
@@
extern zend_module_entry http_module_entry;
# define HTTP_G(v) (http_globals.v)
#endif
# define HTTP_G(v) (http_globals.v)
#endif
-#ifndef ZEND_ENGINE_2
-# include "php_http_build_query.h"
-#else
+#ifdef ZEND_ENGINE_2
+
+typedef struct {
+ zend_object zo;
+} httpi_response_object;
#ifdef HTTP_HAVE_CURL
#ifdef HTTP_HAVE_CURL
+
+#ifdef PHP_WIN32
+# include <winsock2.h>
+#endif
+
+#include <curl/curl.h>
+
+typedef struct {
+ zend_object zo;
+ CURL *ch;
+} httpi_request_object;
+
typedef enum {
HTTP_GET,
HTTP_HEAD,
HTTP_POST,
} http_request_method;
typedef enum {
HTTP_GET,
HTTP_HEAD,
HTTP_POST,
} http_request_method;
-#endif
+
+#endif /* HTTP_HAVE _CURL */
PHP_METHOD(HTTPi, date);
PHP_METHOD(HTTPi, absoluteURI);
PHP_METHOD(HTTPi, date);
PHP_METHOD(HTTPi, absoluteURI);
@@
-68,7
+83,7
@@
PHP_METHOD(HTTPi, get);
PHP_METHOD(HTTPi, head);
PHP_METHOD(HTTPi, postData);
PHP_METHOD(HTTPi, postArray);
PHP_METHOD(HTTPi, head);
PHP_METHOD(HTTPi, postData);
PHP_METHOD(HTTPi, postArray);
-#endif
+#endif
/* HTTP_HAVE_CURL */
PHP_METHOD(HTTPi, authBasic);
PHP_METHOD(HTTPi, authBasicCallback);
PHP_METHOD(HTTPi, authBasic);
PHP_METHOD(HTTPi, authBasicCallback);
@@
-110,14
+125,18
@@
PHP_METHOD(HTTPi_Request, getContentType);
PHP_METHOD(HTTPi_Request, setQueryData);
PHP_METHOD(HTTPi_Request, getQueryData);
PHP_METHOD(HTTPi_Request, addQueryData);
PHP_METHOD(HTTPi_Request, setQueryData);
PHP_METHOD(HTTPi_Request, getQueryData);
PHP_METHOD(HTTPi_Request, addQueryData);
-PHP_METHOD(HTTPi_Request, unsetQueryData);
/*
+PHP_METHOD(HTTPi_Request, unsetQueryData);
PHP_METHOD(HTTPi_Request, setPostData);
PHP_METHOD(HTTPi_Request, setPostData);
+PHP_METHOD(HTTPi_Request, getPostData);
PHP_METHOD(HTTPi_Request, addPostData);
PHP_METHOD(HTTPi_Request, unsetPostData);
PHP_METHOD(HTTPi_Request, addPostData);
PHP_METHOD(HTTPi_Request, unsetPostData);
-PHP_METHOD(HTTPi_Request, addPostFile);*/
+PHP_METHOD(HTTPi_Request, addPostFile);
+PHP_METHOD(HTTPi_Request, getPostFiles);
+PHP_METHOD(HTTPi_Request, unsetPostFiles);
PHP_METHOD(HTTPi_Request, send);
PHP_METHOD(HTTPi_Request, getResponseData);
PHP_METHOD(HTTPi_Request, send);
PHP_METHOD(HTTPi_Request, getResponseData);
-PHP_METHOD(HTTPi_Request, getResponseHeaders);
+PHP_METHOD(HTTPi_Request, getResponseHeader);
+PHP_METHOD(HTTPi_Request, getResponseCode);
PHP_METHOD(HTTPi_Request, getResponseBody);
PHP_METHOD(HTTPi_Request, getResponseInfo);
PHP_METHOD(HTTPi_Request, getResponseBody);
PHP_METHOD(HTTPi_Request, getResponseInfo);
@@
-151,10
+170,12
@@
PHP_FUNCTION(http_get);
PHP_FUNCTION(http_head);
PHP_FUNCTION(http_post_data);
PHP_FUNCTION(http_post_array);
PHP_FUNCTION(http_head);
PHP_FUNCTION(http_post_data);
PHP_FUNCTION(http_post_array);
-#endif
+#endif
/* HTTP_HAVE_CURL */
PHP_FUNCTION(http_auth_basic);
PHP_FUNCTION(http_auth_basic_cb);
PHP_FUNCTION(http_auth_basic);
PHP_FUNCTION(http_auth_basic_cb);
-
+#ifndef ZEND_ENGINE_2
+PHP_FUNCTION(http_build_query);
+#endif /* ZEND_ENGINE_2 */
PHP_FUNCTION(ob_httpetaghandler);
PHP_MINIT_FUNCTION(http);
PHP_FUNCTION(ob_httpetaghandler);
PHP_MINIT_FUNCTION(http);
@@
-173,18
+194,13
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
char *allowed_methods;
#ifdef HTTP_HAVE_CURL
struct {
char *allowed_methods;
#ifdef HTTP_HAVE_CURL
struct {
- struct {
- char *data;
- size_t used;
- size_t free;
- } body;
- struct {
- char *data;
- size_t used;
- size_t free;
- } hdrs;
+ char *data;
+ size_t used;
+ size_t free;
+ size_t size;
} curlbuf;
} curlbuf;
-#endif
+ zend_llist to_free;
+#endif /* HTTP_HAVE_CURL */
ZEND_END_MODULE_GLOBALS(http)
#endif /* PHP_HTTP_H */
ZEND_END_MODULE_GLOBALS(http)
#endif /* PHP_HTTP_H */