#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
-#define PHP_EXT_HTTP_VERSION "0.4.0"
+#define PHP_EXT_HTTP_VERSION "0.6.0"
/* make compile on Win32 */
#include "php_streams.h"
# define HTTP_G(v) (http_globals.v)
#endif
-#ifndef ZEND_ENGINE_2
-# include "php_http_build_query.h"
+#ifdef ZEND_ENGINE_2
+
+typedef struct {
+ zend_object zo;
+} httpi_response_object;
+
+#ifdef HTTP_HAVE_CURL
+
+#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;
+
+#endif
+
+PHP_METHOD(HTTPi, date);
+PHP_METHOD(HTTPi, absoluteURI);
+PHP_METHOD(HTTPi, negotiateLanguage);
+PHP_METHOD(HTTPi, negotiateCharset);
+PHP_METHOD(HTTPi, redirect);
+PHP_METHOD(HTTPi, sendStatus);
+PHP_METHOD(HTTPi, sendLastModified);
+PHP_METHOD(HTTPi, sendContentType);
+PHP_METHOD(HTTPi, sendContentDisposition);
+PHP_METHOD(HTTPi, matchModified);
+PHP_METHOD(HTTPi, matchEtag);
+PHP_METHOD(HTTPi, cacheLastModified);
+PHP_METHOD(HTTPi, cacheEtag);
+PHP_METHOD(HTTPi, chunkedDecode);
+PHP_METHOD(HTTPi, splitResponse);
+PHP_METHOD(HTTPi, parseHeaders);
+PHP_METHOD(HTTPi, getRequestHeaders);
+#ifdef HTTP_HAVE_CURL
+PHP_METHOD(HTTPi, get);
+PHP_METHOD(HTTPi, head);
+PHP_METHOD(HTTPi, postData);
+PHP_METHOD(HTTPi, postArray);
#endif
+PHP_METHOD(HTTPi, authBasic);
+PHP_METHOD(HTTPi, authBasicCallback);
+
+
+PHP_METHOD(HTTPi_Response, __construct);/*
+PHP_METHOD(HTTPi_Response, __destruct);*/
+PHP_METHOD(HTTPi_Response, setETag);
+PHP_METHOD(HTTPi_Response, getETag);
+PHP_METHOD(HTTPi_Response, setContentDisposition);
+PHP_METHOD(HTTPi_Response, getContentDisposition);
+PHP_METHOD(HTTPi_Response, setContentType);
+PHP_METHOD(HTTPi_Response, getContentType);
+PHP_METHOD(HTTPi_Response, setCache);
+PHP_METHOD(HTTPi_Response, getCache);
+PHP_METHOD(HTTPi_Response, setCacheControl);
+PHP_METHOD(HTTPi_Response, getCacheControl);
+PHP_METHOD(HTTPi_Response, setGzip);
+PHP_METHOD(HTTPi_Response, getGzip);
+PHP_METHOD(HTTPi_Response, setData);
+PHP_METHOD(HTTPi_Response, getData);
+PHP_METHOD(HTTPi_Response, setFile);
+PHP_METHOD(HTTPi_Response, getFile);
+PHP_METHOD(HTTPi_Response, setStream);
+PHP_METHOD(HTTPi_Response, getStream);
+PHP_METHOD(HTTPi_Response, send);
+
+#ifdef HTTP_HAVE_CURL
+
+PHP_METHOD(HTTPi_Request, __construct);
+PHP_METHOD(HTTPi_Request, __destruct);
+PHP_METHOD(HTTPi_Request, setOptions);
+PHP_METHOD(HTTPi_Request, getOptions);
+PHP_METHOD(HTTPi_Request, setMethod);
+PHP_METHOD(HTTPi_Request, getMethod);
+PHP_METHOD(HTTPi_Request, setURL);
+PHP_METHOD(HTTPi_Request, getURL);
+PHP_METHOD(HTTPi_Request, setContentType);
+PHP_METHOD(HTTPi_Request, getContentType);
+PHP_METHOD(HTTPi_Request, setQueryData);
+PHP_METHOD(HTTPi_Request, getQueryData);
+PHP_METHOD(HTTPi_Request, addQueryData);
+PHP_METHOD(HTTPi_Request, unsetQueryData);
+PHP_METHOD(HTTPi_Request, setPostData);
+PHP_METHOD(HTTPi_Request, getPostData);
+PHP_METHOD(HTTPi_Request, addPostData);
+PHP_METHOD(HTTPi_Request, unsetPostData);
+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, getResponseHeader);
+PHP_METHOD(HTTPi_Request, getResponseCode);
+PHP_METHOD(HTTPi_Request, getResponseBody);
+PHP_METHOD(HTTPi_Request, getResponseInfo);
+
+#endif /* HTTP_HAVE_CURL */
+
+#endif /* ZEND_ENGINE_2 */
+
PHP_FUNCTION(http_date);
PHP_FUNCTION(http_absolute_uri);
PHP_FUNCTION(http_redirect);
PHP_FUNCTION(http_send_status);
PHP_FUNCTION(http_send_last_modified);
+PHP_FUNCTION(http_send_content_type);
+PHP_FUNCTION(http_send_content_disposition);
PHP_FUNCTION(http_match_modified);
PHP_FUNCTION(http_match_etag);
PHP_FUNCTION(http_cache_last_modified);
PHP_FUNCTION(http_cache_etag);
-PHP_FUNCTION(http_content_type);
-PHP_FUNCTION(http_content_disposition);
PHP_FUNCTION(http_send_data);
PHP_FUNCTION(http_send_file);
PHP_FUNCTION(http_send_stream);
PHP_FUNCTION(http_chunked_decode);
PHP_FUNCTION(http_split_response);
PHP_FUNCTION(http_parse_headers);
+PHP_FUNCTION(http_get_request_headers);
#ifdef HTTP_HAVE_CURL
PHP_FUNCTION(http_get);
PHP_FUNCTION(http_head);
#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_MSHUTDOWN_FUNCTION(http);
+PHP_RINIT_FUNCTION(http);
PHP_RSHUTDOWN_FUNCTION(http);
PHP_MINFO_FUNCTION(http);
char *ctype;
char *etag;
time_t lmod;
+ 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;
+ zend_llist to_free;
#endif
ZEND_END_MODULE_GLOBALS(http)