#endif
#include "php.h"
+#include "zend_operators.h"
+
#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"
#include "php_http_api.h"
-#include "php_http_auth_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_headers_api.h"
}
Z_TYPE_P(return_value) = IS_STRING;
- http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), mode);
+ http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), (uint *) &Z_STRLEN_P(return_value), mode);
}
/* }}} */
{
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: ")],
- RED[HTTP_URI_MAXLEN * 2 + sizeof("Redirecting to <a href=\"%s?%s\">%s?%s</a>.\n")];
+ char *query = NULL, *url = NULL, *URI, *LOC, *RED = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sa!/bb", &url, &url_len, ¶ms, &session, &permanent) != SUCCESS) {
RETURN_FALSE;
}
/* 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(HE_WARNING, HTTP_E_RUNTIME, "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;
}
}
URI = http_absolute_uri(url);
if (query_len) {
- snprintf(LOC, HTTP_URI_MAXLEN + sizeof("Location: "), "Location: %s?%s", URI, query);
- sprintf(RED, "Redirecting to <a href=\"%s?%s\">%s?%s</a>.\n", URI, query, URI, query);
- efree(query);
+ spprintf(&LOC, 0, "Location: %s?%s", URI, query);
+ if (SG(request_info).request_method && strcmp(SG(request_info).request_method, "HEAD")) {
+ spprintf(&RED, 0, "Redirecting to <a href=\"%s?%s\">%s?%s</a>.\n", URI, query, URI, query);
+ }
} else {
- snprintf(LOC, HTTP_URI_MAXLEN + sizeof("Location: "), "Location: %s", URI);
- sprintf(RED, "Redirecting to <a href=\"%s\">%s</a>.\n", URI, URI);
- }
- efree(URI);
-
- if ((SUCCESS == http_send_header_string(LOC)) && (SUCCESS == http_send_status((permanent ? 301 : 302)))) {
+ spprintf(&LOC, 0, "Location: %s", URI);
if (SG(request_info).request_method && strcmp(SG(request_info).request_method, "HEAD")) {
- PHPWRITE(RED, strlen(RED));
+ spprintf(&RED, 0, "Redirecting to <a href=\"%s\">%s</a>.\n", URI, URI);
}
- RETURN_TRUE;
}
- RETURN_FALSE;
+
+ efree(URI);
+ if (query) {
+ efree(query);
+ }
+ if (free_params) {
+ zval_dtor(params);
+ FREE_ZVAL(params);
+ }
+
+ RETURN_SUCCESS(http_exit_ex(permanent ? 301 : 302, LOC, RED, 1));
}
/* }}} */
PHP_FUNCTION(http_chunked_decode)
{
char *encoded = NULL, *decoded = NULL;
- int encoded_len = 0, decoded_len = 0;
+ size_t decoded_len = 0;
+ int encoded_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &encoded, &encoded_len) != SUCCESS) {
RETURN_FALSE;
}
if (NULL != http_chunked_decode(encoded, encoded_len, &decoded, &decoded_len)) {
- RETURN_STRINGL(decoded, decoded_len, 0);
+ RETURN_STRINGL(decoded, (int) decoded_len, 0);
} else {
RETURN_FALSE;
}
}
/* }}} */
-/* {{{ proto array http_split_response(string http_response)
- *
- * This function splits an HTTP response into an array with headers and the
- * content body. The returned array may look simliar to the following example:
+/* {{{ proto object http_parse_message(string message)
*
+ * Parses (a) http_message(s) into a simple recursive object structure:
+ *
* <pre>
* <?php
- * array(
- * 0 => array(
- * 'Response Status' => '200 Ok',
- * 'Content-Type' => 'text/plain',
- * 'Content-Language' => 'en-US'
- * ),
- * 1 => "Hello World!"
- * );
+ * print_r(http_parse_message(http_get(URL, array('redirect' => 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] => ...
+ * )
+ * )
* ?>
* </pre>
*/
-PHP_FUNCTION(http_split_response)
+PHP_FUNCTION(http_parse_message)
{
- char *response, *body;
- int response_len;
- size_t body_len;
- zval *zheaders;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &response, &response_len) != SUCCESS) {
- RETURN_FALSE;
+ 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();
}
-
- MAKE_STD_ZVAL(zheaders);
- array_init(zheaders);
-
- if (SUCCESS != http_split_response(response, response_len, Z_ARRVAL_P(zheaders), &body, &body_len)) {
- RETURN_FALSE;
+
+
+ if (msg = http_message_parse(message, message_len)) {
+ object_init(return_value);
+ http_message_tostruct_recursive(msg, return_value);
+ http_message_free(&msg);
+ } else {
+ RETURN_NULL();
}
-
- array_init(return_value);
- add_index_zval(return_value, 0, zheaders);
- add_index_stringl(return_value, 1, body, body_len, 0);
}
/* }}} */
* 'content_type' => 'text/html; charset=iso-8859-1',
* 'redirect_time' => 0,
* 'redirect_count' => 0,
- * 'private' => '',
* 'http_connectcode' => 0,
* 'httpauth_avail' => 0,
* 'proxyauth_avail' => 0,
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);
+ RETURN_PHPSTR_VAL(&response);
} else {
RETURN_FALSE;
}
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);
+ RETURN_PHPSTR_VAL(&response);
} else {
RETURN_FALSE;
}
}
/* }}} */
-/* {{{ proto string http_post_data(string url, string data[, array options[, &info]])
+/* {{{ proto string http_post_data(string url, string data[, array options[, array &info]])
*
* Performs an HTTP POST request, posting data.
* Returns the HTTP response as string.
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);
+ RETVAL_PHPSTR_VAL(&response);
} else {
RETVAL_FALSE;
}
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);
+ RETVAL_PHPSTR_VAL(&response);
} else {
RETVAL_FALSE;
}
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);
+ RETVAL_PHPSTR_VAL(&response);
} else {
RETVAL_FALSE;
}
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);
+ RETURN_PHPSTR_VAL(&response);
} else {
RETURN_NULL();
}
}
/* }}} */
+#endif /* HTTP_HAVE_CURL */
+/* }}} HAVE_CURL */
/* {{{ proto long http_request_method_register(string method)
*
case IS_OBJECT:
convert_to_string(method);
case IS_STRING:
-#include "zend_operators.h"
if (is_numeric_string(Z_STRVAL_P(method), Z_STRLEN_P(method), NULL, NULL, 1)) {
convert_to_long(method);
} else {
}
}
/* }}} */
-#endif
-/* }}} HAVE_CURL */
-
-
-/* {{{ proto bool http_auth_basic(string user, string pass[, string realm = "Restricted"])
- *
- * Example:
- * <pre>
- * <?php
- * if (!http_auth_basic('mike', 's3c|r3t')) {
- * die('<h1>Authorization failed!</h1>');
- * }
- * ?>
- * </pre>
- */
-PHP_FUNCTION(http_auth_basic)
-{
- char *realm = NULL, *user, *pass, *suser, *spass;
- int r_len, u_len, p_len;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|s", &user, &u_len, &pass, &p_len, &realm, &r_len) != SUCCESS) {
- RETURN_FALSE;
- }
-
- if (!realm) {
- realm = "Restricted";
- }
-
- if (SUCCESS != http_auth_basic_credentials(&suser, &spass)) {
- http_auth_basic_header(realm);
- RETURN_FALSE;
- }
-
- if (strcasecmp(suser, user)) {
- http_auth_basic_header(realm);
- RETURN_FALSE;
- }
-
- if (strcmp(spass, pass)) {
- http_auth_basic_header(realm);
- RETURN_FALSE;
- }
-
- RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto bool http_auth_basic_cb(mixed callback[, string realm = "Restricted"])
- *
- * Example:
- * <pre>
- * <?php
- * function auth_cb($user, $pass)
- * {
- * global $db;
- * $query = 'SELECT pass FROM users WHERE user='. $db->quoteSmart($user);
- * if (strlen($realpass = $db->getOne($query)) {
- * return $pass === $realpass;
- * }
- * return false;
- * }
- * if (!http_auth_basic_cb('auth_cb')) {
- * die('<h1>Authorization failed</h1>');
- * }
- * ?>
- * </pre>
- */
-PHP_FUNCTION(http_auth_basic_cb)
-{
- zval *cb;
- char *realm = NULL, *user, *pass;
- int r_len;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s", &cb, &realm, &r_len) != SUCCESS) {
- RETURN_FALSE;
- }
-
- if (!realm) {
- realm = "Restricted";
- }
-
- if (SUCCESS != http_auth_basic_credentials(&user, &pass)) {
- http_auth_basic_header(realm);
- RETURN_FALSE;
- }
- {
- zval *zparams[2] = {NULL, NULL}, retval;
- int result = 0;
-
- MAKE_STD_ZVAL(zparams[0]);
- MAKE_STD_ZVAL(zparams[1]);
- ZVAL_STRING(zparams[0], user, 0);
- ZVAL_STRING(zparams[1], pass, 0);
-
- if (SUCCESS == call_user_function(EG(function_table), NULL, cb,
- &retval, 2, zparams TSRMLS_CC)) {
- result = Z_LVAL(retval);
- }
-
- efree(user);
- efree(pass);
- efree(zparams[0]);
- efree(zparams[1]);
-
- if (!result) {
- http_auth_basic_header(realm);
- }
-
- RETURN_BOOL(result);
- }
-}
-/* }}}*/
/* {{{ Sara Golemons http_build_query() */
#ifndef ZEND_ENGINE_2
formstr = phpstr_new();
if (SUCCESS != http_urlencode_hash_implementation_ex(HASH_OF(formdata), formstr, arg_sep, prefix, prefix_len, NULL, 0, NULL, 0, (Z_TYPE_P(formdata) == IS_OBJECT ? formdata : NULL))) {
- phpstr_free(formstr);
+ phpstr_free(&formstr);
RETURN_FALSE;
}
if (!formstr->used) {
- phpstr_free(formstr);
+ phpstr_free(&formstr);
RETURN_NULL();
}
PHP_FUNCTION(http_test)
{
- RETURN_BOOL(HTTP_G(only_exceptions));
}
/*