X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=ae27b5ea7f213ad46bb174b6a70c060b933c7ff1;hp=e9cd9f77e2ea51511b21d76d896608b6322a1ab7;hb=1d37eec22d2a073acd8785431621c26c2312a246;hpb=3f8d6ea256f520d439cebc37c46bb93c30b2660e
diff --git a/http_functions.c b/http_functions.c
index e9cd9f7..ae27b5e 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -23,8 +23,10 @@
#include "SAPI.h"
#include "php_ini.h"
#include "ext/standard/info.h"
-#include "ext/session/php_session.h"
#include "ext/standard/php_string.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"
@@ -202,7 +204,7 @@ PHP_FUNCTION(http_send_status)
RETURN_FALSE;
}
if (status < 100 || status > 510) {
- http_error_ex(E_WARNING, HTTP_E_HEADER, "Invalid HTTP status code (100-510): %d", status);
+ http_error_ex(HE_WARNING, HTTP_E_HEADER, "Invalid HTTP status code (100-510): %d", status);
RETURN_FALSE;
}
@@ -457,7 +459,7 @@ PHP_FUNCTION(http_redirect)
{
int url_len;
size_t query_len = 0;
- zend_bool session = 0, permanent = 0;
+ zend_bool session = 0, permanent = 0, free_params = 0;
zval *params = NULL;
char *query = NULL, *url = NULL, *URI,
LOC[HTTP_URI_MAXLEN + sizeof("Location: ")],
@@ -468,19 +470,56 @@ PHP_FUNCTION(http_redirect)
}
/* append session info */
- if (session && (PS(session_status) == php_session_active)) {
+ if (session) {
if (!params) {
+ free_params = 1;
MAKE_STD_ZVAL(params);
array_init(params);
}
- if (add_assoc_string(params, PS(session_name), PS(id), 1) != SUCCESS) {
- http_error(E_WARNING, HTTP_E_ENCODE, "Could not append session information");
+#ifdef HAVE_PHP_SESSION
+# ifdef COMPILE_DL_SESSION
+ if (SUCCESS == zend_get_module_started("session")) {
+ zval nm_retval, id_retval, func;
+
+ INIT_PZVAL(&func);
+ INIT_PZVAL(&nm_retval);
+ INIT_PZVAL(&id_retval);
+ ZVAL_NULL(&nm_retval);
+ ZVAL_NULL(&id_retval);
+
+ ZVAL_STRINGL(&func, "session_id", lenof("session_id"), 0);
+ call_user_function(EG(function_table), NULL, &func, &id_retval, 0, NULL TSRMLS_CC);
+ ZVAL_STRINGL(&func, "session_name", lenof("session_name"), 0);
+ call_user_function(EG(function_table), NULL, &func, &nm_retval, 0, NULL TSRMLS_CC);
+
+ if ( Z_TYPE(nm_retval) == IS_STRING && Z_STRLEN(nm_retval) &&
+ Z_TYPE(id_retval) == IS_STRING && Z_STRLEN(id_retval)) {
+ if (add_assoc_stringl_ex(params, Z_STRVAL(nm_retval), Z_STRLEN(nm_retval)+1,
+ Z_STRVAL(id_retval), Z_STRLEN(id_retval), 0) != SUCCESS) {
+ http_error(HE_WARNING, HTTP_E_RUNTIME, "Could not append session information");
+ }
+ }
+ }
+# else
+ if (PS(session_status) == php_session_active) {
+ if (add_assoc_string(params, PS(session_name), PS(id), 1) != SUCCESS) {
+ http_error(HE_WARNING, HTTP_E_RUNTIME, "Could not append session information");
+ }
}
+# endif
+#endif
}
/* treat params array with http_build_query() */
if (params) {
if (SUCCESS != http_urlencode_hash_ex(Z_ARRVAL_P(params), 0, NULL, 0, &query, &query_len)) {
+ if (free_params) {
+ zval_dtor(params);
+ FREE_ZVAL(params);
+ }
+ if (query) {
+ efree(query);
+ }
RETURN_FALSE;
}
}
@@ -490,15 +529,24 @@ PHP_FUNCTION(http_redirect)
if (query_len) {
snprintf(LOC, HTTP_URI_MAXLEN + sizeof("Location: "), "Location: %s?%s", URI, query);
sprintf(RED, "Redirecting to %s?%s.\n", URI, query, URI, query);
- efree(query);
} else {
snprintf(LOC, HTTP_URI_MAXLEN + sizeof("Location: "), "Location: %s", URI);
sprintf(RED, "Redirecting to %s.\n", URI, URI);
}
+
efree(URI);
+ if (query) {
+ efree(query);
+ }
+ if (free_params) {
+ zval_dtor(params);
+ FREE_ZVAL(params);
+ }
- if ((SUCCESS == http_send_header(LOC)) && (SUCCESS == http_send_status((permanent ? 301 : 302)))) {
- php_body_write(RED, strlen(RED) TSRMLS_CC);
+ if ((SUCCESS == http_send_header_string(LOC)) && (SUCCESS == http_send_status((permanent ? 301 : 302)))) {
+ if (SG(request_info).request_method && strcmp(SG(request_info).request_method, "HEAD")) {
+ PHPWRITE(RED, strlen(RED));
+ }
RETURN_TRUE;
}
RETURN_FALSE;
@@ -618,7 +666,6 @@ PHP_FUNCTION(http_split_response)
array_init(zheaders);
if (SUCCESS != http_split_response(response, response_len, Z_ARRVAL_P(zheaders), &body, &body_len)) {
- http_error(E_WARNING, HTTP_E_PARSE, "Could not parse HTTP response");
RETURN_FALSE;
}
@@ -628,6 +675,104 @@ PHP_FUNCTION(http_split_response)
}
/* }}} */
+static void http_message_toobject_recursive(http_message *msg, zval *obj TSRMLS_DC)
+{
+ zval *headers;
+
+ add_property_long(obj, "type", msg->type);
+ switch (msg->type)
+ {
+ case HTTP_MSG_RESPONSE:
+ add_property_double(obj, "httpVersion", msg->info.response.http_version);
+ add_property_long(obj, "responseCode", msg->info.response.code);
+ break;
+
+ case HTTP_MSG_REQUEST:
+ add_property_double(obj, "httpVersion", msg->info.request.http_version);
+ add_property_string(obj, "requestMethod", msg->info.request.method, 1);
+ add_property_string(obj, "requestUri", msg->info.request.URI, 1);
+ break;
+ }
+
+ MAKE_STD_ZVAL(headers);
+ array_init(headers);
+ zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+ add_property_zval(obj, "headers", headers);
+ zval_ptr_dtor(&headers);
+
+ add_property_stringl(obj, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg), 1);
+
+ if (msg->parent) {
+ zval *parent;
+
+ MAKE_STD_ZVAL(parent);
+ object_init(parent);
+ add_property_zval(obj, "parentMessage", parent);
+ http_message_toobject_recursive(msg->parent, parent TSRMLS_CC);
+ zval_ptr_dtor(&parent);
+ } else {
+ add_property_null(obj, "parentMessage");
+ }
+ http_message_dtor(msg);
+ efree(msg);
+}
+
+/* {{{ proto object http_parse_message(string message)
+ *
+ * Parses (a) http_message(s) into a simple recursive object structure:
+ *
+ *
+ * 3)));
+ *
+ * stdClass object
+ * (
+ * [type] => 2
+ * [httpVersion] => 1.1
+ * [responseCode] => 200
+ * [headers] => Array
+ * (
+ * [Content-Length] => 3
+ * [Server] => Apache
+ * )
+ * [body] => Hi!
+ * [parentMessage] => stdClass object
+ * (
+ * [type] => 2
+ * [httpVersion] => 1.1
+ * [responseCode] => 302
+ * [headers] => Array
+ * (
+ * [Content-Length] => 0
+ * [Location] => ...
+ * )
+ * [body] =>
+ * [parentMessage] => ...
+ * )
+ * )
+ * ?>
+ *
+ */
+PHP_FUNCTION(http_parse_message)
+{
+ char *message;
+ int message_len;
+ http_message *msg = NULL;
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &message, &message_len)) {
+ RETURN_NULL();
+ }
+
+
+ if (msg = http_message_parse(message, message_len)) {
+ object_init(return_value);
+ http_message_toobject_recursive(msg, return_value TSRMLS_CC);
+ } else {
+ RETURN_NULL();
+ }
+}
+/* }}} */
+
/* {{{ proto array http_parse_headers(string header)
*
*/
@@ -642,7 +787,6 @@ PHP_FUNCTION(http_parse_headers)
array_init(return_value);
if (SUCCESS != http_parse_headers(header, return_value)) {
- http_error(E_WARNING, HTTP_E_PARSE, "Could not parse HTTP headers");
zval_dtor(return_value);
RETURN_FALSE;
}
@@ -1227,7 +1371,7 @@ PHP_FUNCTION(http_build_query)
}
if (Z_TYPE_P(formdata) != IS_ARRAY && Z_TYPE_P(formdata) != IS_OBJECT) {
- http_error(E_WARNING, HTTP_E_PARAM, "Parameter 1 expected to be Array or Object. Incorrect value given.");
+ http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Parameter 1 expected to be Array or Object. Incorrect value given.");
RETURN_FALSE;
}
@@ -1254,7 +1398,6 @@ PHP_FUNCTION(http_build_query)
PHP_FUNCTION(http_test)
{
- RETURN_NULL();
}
/*
@@ -1265,3 +1408,4 @@ PHP_FUNCTION(http_test)
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
+