projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
* ditch some inline functions and replace them with a macro
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index b2bdbe24b63d408c728ac57afc9e3e7d23ad2593..55b59891ab71063256637cd1633b1dfa31a4110b 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.
6
.0-dev"
/* make compile on Win32 */
#include "php_streams.h"
/* make compile on Win32 */
#include "php_streams.h"
@@
-34,29
+34,27
@@
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
+
+#include <curl/curl.h>
+
typedef struct {
typedef struct {
- struct {
- char *data;
- size_t used;
- size_t free;
- } body;
- struct {
- char *data;
- size_t used;
- size_t free;
- } hdrs;
-} http_curlbuf;
+ 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
PHP_METHOD(HTTPi, date);
#endif
PHP_METHOD(HTTPi, date);
@@
-123,11
+121,14
@@
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, getResponseHeaders);
PHP_METHOD(HTTPi_Request, send);
PHP_METHOD(HTTPi_Request, getResponseData);
PHP_METHOD(HTTPi_Request, getResponseHeaders);
@@
-167,7
+168,9
@@
PHP_FUNCTION(http_post_array);
#endif
PHP_FUNCTION(http_auth_basic);
PHP_FUNCTION(http_auth_basic_cb);
#endif
PHP_FUNCTION(http_auth_basic);
PHP_FUNCTION(http_auth_basic_cb);
-
+#ifndef ZEND_ENGINE_2
+PHP_FUNCTION(http_build_query);
+#endif
PHP_FUNCTION(ob_httpetaghandler);
PHP_MINIT_FUNCTION(http);
PHP_FUNCTION(ob_httpetaghandler);
PHP_MINIT_FUNCTION(http);
@@
-185,7
+188,13
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
time_t lmod;
char *allowed_methods;
#ifdef HTTP_HAVE_CURL
time_t lmod;
char *allowed_methods;
#ifdef HTTP_HAVE_CURL
- http_curlbuf curlbuf;
+ struct {
+ char *data;
+ size_t used;
+ size_t free;
+ size_t size;
+ } curlbuf;
+ zend_llist to_free;
#endif
ZEND_END_MODULE_GLOBALS(http)
#endif
ZEND_END_MODULE_GLOBALS(http)