#define PHP_HTTP_API_H
#ifdef PHP_WIN32
-#define PHP_HTTP_API __declspec(dllexport)
+# define PHP_HTTP_API __declspec(dllexport)
#else
-#define PHP_HTTP_API
+# define PHP_HTTP_API
+#endif
+
+#ifndef ZEND_ENGINE_2
+# include "php_http_build_query.h"
#endif
/* make functions that return SUCCESS|FAILURE more obvious */
} http_send_mode;
/* }}} */
+/* CR LF */
+#define HTTP_CRLF "\r\n"
+
/* max URI length */
#define HTTP_URI_MAXLEN 2048
/* buffer size */
#define HTTP_BUF_SIZE 2097152
+/* server vars shorthand */
+#define HTTP_SERVER_VARS Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER])
+
/* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
/* CURL buffer size */
#define HTTP_CURLBUF_BODYSIZE 16384
#define http_date(t) _http_date((t) TSRMLS_CC)
PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC);
-PHP_HTTP_API time_t http_parse_date(const char *date);
+#define http_parse_date(d) _http_parse_date((d))
+PHP_HTTP_API time_t _http_parse_date(const char *date);
#define http_send_status(s) _http_send_status((s) TSRMLS_CC)
PHP_HTTP_API inline STATUS _http_send_status(const int status TSRMLS_DC);
PHP_HTTP_API int _http_etag_match(const char *entry, const char *etag TSRMLS_DC);
#define http_send_last_modified(t) _http_send_last_modified((t) TSRMLS_CC)
-PHP_HTTP_API STATUS _http_send_last_modified(const int t TSRMLS_DC);
+PHP_HTTP_API STATUS _http_send_last_modified(const time_t t TSRMLS_DC);
#define http_send_etag(e, l) _http_send_etag((e), (l) TSRMLS_CC)
PHP_HTTP_API STATUS _http_send_etag(const char *etag, const int etag_len TSRMLS_DC);
PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, const size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC);
#define http_split_response(r, h, b) _http_split_response((r), (h), (b) TSRMLS_CC)
-PHP_HTTP_API void _http_split_response(const zval *zresponse, zval *zheaders, zval *zbody TSRMLS_DC);
+PHP_HTTP_API STATUS _http_split_response(const zval *zresponse, zval *zheaders, zval *zbody TSRMLS_DC);
+
+#define http_parse_headers(h, l, a) _http_parse_headers((h), (l), (a) TSRMLS_CC)
+PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *array TSRMLS_DC);
+
+#define http_get_request_headers(h) _http_get_request_headers((h) TSRMLS_CC)
+PHP_HTTP_API void _http_get_request_headers(zval *array TSRMLS_DC);
/* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
-#define http_get(u, o, d, l) _http_get((u), (o), (d), (l) TSRMLS_CC)
-PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options, char **data, size_t *data_len TSRMLS_DC);
+#define http_get(u, o, i, d, l) _http_get((u), (o), (i), (d), (l) TSRMLS_CC)
+PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC);
-#define http_head(u, o, d, l) _http_head((u), (o), (d), (l) TSRMLS_CC)
-PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options, char **data, size_t *data_len TSRMLS_DC);
+#define http_head(u, o, i, d, l) _http_head((u), (o), (i), (d), (l) TSRMLS_CC)
+PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC);
-#define http_post_data(u, pd, pl, o, d, l) _http_post_data((u), (pd), (pl), (o), (d), (l) TSRMLS_CC)
-PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata, size_t postdata_len, HashTable *options, char **data, size_t *data_len TSRMLS_DC);
+#define http_post_data(u, pd, pl, o, i, d, l) _http_post_data((u), (pd), (pl), (o), (i), (d), (l) TSRMLS_CC)
+PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata, size_t postdata_len, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC);
-#define http_post_array(u, p, o, d, l) _http_post_array((u), (p), (o), (d), (l) TSRMLS_CC)
-PHP_HTTP_API STATUS _http_post_array(const char *URL, HashTable *postarray, HashTable *options, char **data, size_t *data_len TSRMLS_DC);
+#define http_post_array(u, p, o, i, d, l) _http_post_array((u), (p), (o), (i), (d), (l) TSRMLS_CC)
+PHP_HTTP_API STATUS _http_post_array(const char *URL, HashTable *postarray, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC);
#endif
/* }}} HAVE_CURL */
PHP_HTTP_API STATUS _http_auth_credentials(char **user, char **pass TSRMLS_DC);
#define http_auth_header(t, r) _http_auth_header((t), (r) TSRMLS_CC)
-PHP_HTTP_API void _http_auth_header(const char *type, const char *realm TSRMLS_DC);
+PHP_HTTP_API STATUS _http_auth_header(const char *type, const char *realm TSRMLS_DC);
/* }}} */
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
+