X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=5cb8a16a400c5cb5d3590c6171b838ed4e56243b;hp=469dd946d6227d886625c455220796982d3fa24a;hb=f9d92cff35589f414e369228502c91f35a4e3643;hpb=d23b45cea3f50c901c12a05f53eb3cfee594d0e4
diff --git a/http_functions.c b/http_functions.c
index 469dd94..5cb8a16 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -15,33 +15,30 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
-#include "zend_operators.h"
+#define HTTP_WANT_CURL
+#include "php_http.h"
#include "SAPI.h"
#include "php_ini.h"
#include "ext/standard/info.h"
#include "ext/standard/php_string.h"
+#include "zend_operators.h"
+
#if defined(HAVE_PHP_SESSION) && !defined(COMPILE_DL_SESSION)
# include "ext/session/php_session.h"
#endif
-#include "php_http.h"
-#include "php_http_std_defs.h"
#include "php_http_api.h"
-#include "php_http_request_api.h"
#include "php_http_cache_api.h"
-#include "php_http_request_method_api.h"
-#include "php_http_request_api.h"
#include "php_http_date_api.h"
+#include "php_http_encoding_api.h"
#include "php_http_headers_api.h"
#include "php_http_message_api.h"
+#include "php_http_request_api.h"
+#include "php_http_request_method_api.h"
#include "php_http_send_api.h"
#include "php_http_url_api.h"
-#include "php_http_encoding_api.h"
-
-#include "phpstr/phpstr.h"
ZEND_EXTERN_MODULE_GLOBALS(http)
@@ -82,7 +79,7 @@ PHP_FUNCTION(http_date)
* If a port is pecified in either the url or as sperate parameter,
* it will be added if it differs from te default port for HTTP(S).
*
- * Returns the absolute URI as string.
+ * Returns the absolute URI as string on success or false on failure.
*
* Examples:
*
@@ -93,7 +90,7 @@ PHP_FUNCTION(http_date)
*/
PHP_FUNCTION(http_build_uri)
{
- char *url = NULL, *proto = NULL, *host = NULL;
+ char *url = NULL, *proto = NULL, *host = NULL, *built = NULL;
int url_len = 0, proto_len = 0, host_len = 0;
long port = 0;
@@ -101,14 +98,17 @@ PHP_FUNCTION(http_build_uri)
RETURN_FALSE;
}
- RETURN_STRING(http_absolute_uri_ex(url, url_len, proto, proto_len, host, host_len, port), 0);
+ if ((built = http_absolute_uri_ex(url, url_len, proto, proto_len, host, host_len, port))) {
+ RETURN_STRING(built, 0);
+ }
+ RETURN_FALSE;
}
/* }}} */
#define HTTP_DO_NEGOTIATE(type, supported, rs_array) \
{ \
HashTable *result; \
- if (result = http_negotiate_ ##type(supported)) { \
+ if ((result = http_negotiate_ ##type(supported))) { \
char *key; \
uint key_len; \
ulong idx; \
@@ -137,9 +137,10 @@ PHP_FUNCTION(http_build_uri)
} \
\
if (rs_array) { \
+ HashPosition pos; \
zval **value; \
\
- FOREACH_VAL(supported, value) { \
+ FOREACH_VAL(pos, supported, value) { \
convert_to_string_ex(value); \
add_assoc_double(rs_array, Z_STRVAL_PP(value), 1.0); \
} \
@@ -250,6 +251,44 @@ PHP_FUNCTION(http_negotiate_charset)
}
/* }}} */
+/* {{{ proto string http_negotiate_ctype(array supported[, array &result])
+ *
+ * This function negotiates the clients preferred content type based on its
+ * Accept HTTP header. The qualifier is recognized and content types
+ * without qualifier are rated highest.
+ *
+ * Expects an array as parameter cotaining the supported content types as values.
+ * If the optional second parameter is supplied, it will be filled with an
+ * array containing the negotiation results.
+ *
+ * Returns the negotiated content type or the default content type
+ * (i.e. first array entry) if none match.
+ *
+ * Example:
+ *
+ *
+ *
+ */
+PHP_FUNCTION(http_negotiate_content_type)
+{
+ zval *supported, *rs_array = NULL;
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|z", &supported, &rs_array)) {
+ RETURN_FALSE;
+ }
+
+ if (rs_array) {
+ zval_dtor(rs_array);
+ array_init(rs_array);
+ }
+
+ HTTP_DO_NEGOTIATE(content_type, supported, rs_array);
+}
+/* }}} */
+
/* {{{ proto bool http_send_status(int status)
*
* Send HTTP status code.
@@ -438,13 +477,15 @@ PHP_FUNCTION(http_cache_last_modified)
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &last_modified) != SUCCESS) {
RETURN_FALSE;
}
+
+ HTTP_CHECK_HEADERS_SENT(RETURN_FALSE);
t = (long) time(NULL);
/* 0 or omitted */
if (!last_modified) {
/* does the client have? (att: caching "forever") */
- if (zlm = http_get_server_var("HTTP_IF_MODIFIED_SINCE")) {
+ if ((zlm = http_get_server_var("HTTP_IF_MODIFIED_SINCE"))) {
last_modified = send_modified = http_parse_date(Z_STRVAL_P(zlm));
/* send current time */
} else {
@@ -485,6 +526,8 @@ PHP_FUNCTION(http_cache_etag)
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &etag, &etag_len) != SUCCESS) {
RETURN_FALSE;
}
+
+ HTTP_CHECK_HEADERS_SENT(RETURN_FALSE);
RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL)));
}
@@ -812,7 +855,7 @@ PHP_FUNCTION(http_parse_message)
RETURN_NULL();
}
- if (msg = http_message_parse(message, message_len)) {
+ if ((msg = http_message_parse(message, message_len))) {
object_init(return_value);
http_message_tostruct_recursive(msg, return_value);
http_message_free(&msg);
@@ -934,6 +977,25 @@ PHP_FUNCTION(http_match_request_header)
/* {{{ HAVE_CURL */
#ifdef HTTP_HAVE_CURL
+#define RETURN_RESPONSE_OR_BODY(response) \
+ { \
+ zval **bodyonly; \
+ \
+ /* check if only the body should be returned */ \
+ if (options && (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), "bodyonly", sizeof("bodyonly"), (void **) &bodyonly)) && zval_is_true(*bodyonly)) { \
+ http_message *msg = http_message_parse(PHPSTR_VAL(&response), PHPSTR_LEN(&response)); \
+ \
+ if (msg) { \
+ RETVAL_STRINGL(PHPSTR_VAL(&msg->body), PHPSTR_LEN(&msg->body), 1); \
+ http_message_free(&msg); \
+ phpstr_dtor(&response); \
+ return; \
+ } \
+ } else { \
+ RETURN_PHPSTR_VAL(&response); \
+ } \
+ }
+
/* {{{ proto string http_get(string url[, array options[, array &info]])
*
* Performs an HTTP GET request on the supplied url.
@@ -1023,11 +1085,10 @@ PHP_FUNCTION(http_get)
phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
if (SUCCESS == http_get(URL, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
- RETURN_PHPSTR_VAL(&response);
- } else {
- phpstr_dtor(&response);
- RETURN_FALSE;
+ RETURN_RESPONSE_OR_BODY(response);
}
+ phpstr_dtor(&response);
+ RETURN_FALSE;
}
/* }}} */
@@ -1057,11 +1118,10 @@ PHP_FUNCTION(http_head)
phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
if (SUCCESS == http_head(URL, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
- RETURN_PHPSTR_VAL(&response);
- } else {
- phpstr_dtor(&response);
- RETURN_FALSE;
+ RETURN_RESPONSE_OR_BODY(response);
}
+ phpstr_dtor(&response);
+ RETURN_FALSE;
}
/* }}} */
@@ -1097,11 +1157,10 @@ PHP_FUNCTION(http_post_data)
phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
if (SUCCESS == http_post(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
- RETVAL_PHPSTR_VAL(&response);
- } else {
- phpstr_dtor(&response);
- RETVAL_FALSE;
+ RETURN_RESPONSE_OR_BODY(response);
}
+ phpstr_dtor(&response);
+ RETVAL_FALSE;
}
/* }}} */
@@ -1137,12 +1196,12 @@ PHP_FUNCTION(http_post_fields)
phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
if (SUCCESS == http_post(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
- RETVAL_PHPSTR_VAL(&response);
- } else {
- phpstr_dtor(&response);
- RETVAL_FALSE;
+ http_request_body_dtor(&body);
+ RETURN_RESPONSE_OR_BODY(response);
}
http_request_body_dtor(&body);
+ phpstr_dtor(&response);
+ RETURN_FALSE;
}
/* }}} */
@@ -1188,12 +1247,12 @@ PHP_FUNCTION(http_put_file)
phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
if (SUCCESS == http_put(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
- RETVAL_PHPSTR_VAL(&response);
- } else {
- phpstr_dtor(&response);
- RETVAL_FALSE;
+ http_request_body_dtor(&body);
+ RETURN_RESPONSE_OR_BODY(response);
}
http_request_body_dtor(&body);
+ phpstr_dtor(&response);
+ RETURN_FALSE;
}
/* }}} */
@@ -1237,11 +1296,10 @@ PHP_FUNCTION(http_put_stream)
phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
if (SUCCESS == http_put(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
- RETURN_PHPSTR_VAL(&response);
- } else {
- phpstr_dtor(&response);
- RETURN_NULL();
+ RETURN_RESPONSE_OR_BODY(response);
}
+ phpstr_dtor(&response);
+ RETURN_FALSE;
}
/* }}} */
#endif /* HTTP_HAVE_CURL */
@@ -1264,7 +1322,7 @@ PHP_FUNCTION(http_request_method_register)
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len)) {
RETURN_FALSE;
}
- if (existing = http_request_method_exists(1, 0, method)) {
+ if ((existing = http_request_method_exists(1, 0, method))) {
RETURN_LONG((long) existing);
}
@@ -1606,8 +1664,6 @@ PHP_FUNCTION(http_uncompress)
* and SSL requests can be issued
* HTTP_SUPPORT_ENCODINGS: whether ext/http was linked against zlib,
* and compressed HTTP responses can be decoded
- * HTTP_SUPPORT_MHASHETAGS: whether ext/http was linked against libmhash,
- * and ETags can be generated with the available mhash algorithms
* HTTP_SUPPORT_MAGICMIME: whether ext/http was linked against libmagic,
* and the HttpResponse::guessContentType() method is usable
*