X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http_functions.c;h=b16cef17e43c59725be76cfd2add8d5ad0a2c594;hb=1052c4986a794b051dc48ba4118dbd6fd8f83c49;hp=a3b4882b65ee40c50001c9c3a73fa94b7bdf109d;hpb=1f5a1441ed2a2a655f1bdcbf962c59b6e6c311a8;p=m6w6%2Fext-http

diff --git a/http_functions.c b/http_functions.c
index a3b4882..b16cef1 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -27,6 +27,7 @@
 
 #include "php_http_api.h"
 #include "php_http_cache_api.h"
+#include "php_http_cookie_api.h"
 #include "php_http_date_api.h"
 #include "php_http_encoding_api.h"
 #include "php_http_headers_api.h"
@@ -38,7 +39,7 @@
 
 /* {{{ proto string http_date([int timestamp])
  *
- * Compose a valid HTTP date regarding RFC 822/1123
+ * Compose a valid HTTP date regarding RFC 1123
  * looking like: "Wed, 22 Dec 2004 11:34:47 GMT"
  *
  * Accepts an optional unix timestamp as parameter.
@@ -63,6 +64,44 @@ PHP_FUNCTION(http_date)
 
 /* {{{ proto string http_build_url(mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE[, array &new_url]]])
  *
+ * Build an URL.
+ *
+ * Expexts (part(s) of) an URL as first parameter in form of a string or assoziative array
+ * like parse_url() returns.  Accepts an optional second parameter in the same way as the
+ * first argument.  Accepts an optional third integer parameter, which is a bitmask of
+ * binary or'ed HTTP_URL_* constants.  The optional fourth parameter will be filled
+ * with the results as associative array like parse_url() would return.
+ *
+ * The parts of the second URL will be merged into the first according to the flags argument.
+ * The following flags are recognized:
+ * <pre>
+ *	- HTTP_URL_REPLACE:        (default) set parts of the second url will replace the parts in the first
+ *	- HTTP_URL_JOIN_PATH:      the path of the second url will be merged into the one of the first
+ *	- HTTP_URL_JOIN_QUERY:     the two querystrings will be merged naivly; no replacements are done
+ *	- HTTP_URL_STRIP_USER:     the user part will not appear in the result
+ *	- HTTP_URL_STRIP_PASS:     the password part will not appear in the result
+ *	- HTTP_URL_STRIP_AUTH:     neither the user nor the password part will appear in the result
+ *	- HTTP_URL_STRIP_PORT:     no explicit port will be set in the result
+ *	- HTTP_URL_STRIP_PATH:     the path part will not appear in the result
+ *	- HTTP_URL_STRIP_QUERY:    no query string will be present in the result
+ *	- HTTP_URL_STRIP_FRAGMENT: no fragment will be present in the result
+ * </pre>
+ *
+ * Example:
+ * <pre>
+ * <?php
+ * 		// ftp://ftp.example.com/pub/files/current/?a=b&a=c
+ * 		echo http_build_url("http://user@www.example.com/pub/index.php?a=b#files",
+ * 			array(
+ * 				"scheme" => "ftp",
+ * 				"host"   => "ftp.example.com",
+ * 				"path"   => "files/current/",
+ * 				"query"  => "a=c"
+ * 			),
+ * 			HTTP_URL_STRIP_AUTH | HTTP_URL_JOIN_PATH | HTTP_URL_JOIN_QUERY | HTTP_URL_STRIP_FRAGMENT
+ * 		);
+ * ?>
+ * </pre>
  * Returns the new URL as string on success or FALSE on failure.
  */
 PHP_FUNCTION(http_build_url)
@@ -148,6 +187,13 @@ PHP_FUNCTION(http_build_url)
 /* {{{ proto string http_build_str(array query [, string prefix[, string arg_separator]])
  *
  * Opponent to parse_str().
+ *
+ * Expects an array as first argument which represents the parts of the query string to build.
+ * Accepts a string as optional second parameter containing a top-level prefix to use.
+ * The optional third parameter should specify an argument separator to use (by default the
+ * INI setting arg_separator.output will be used, or "&" if neither is set).
+ *
+ * Returns the built query as string on success or FALSE on failure.
  */
 PHP_FUNCTION(http_build_str)
 {
@@ -657,8 +703,8 @@ PHP_FUNCTION(http_throttle)
 		return;
 	}
 
-	HTTP_G(send).throttle_delay = interval;
-	HTTP_G(send).buffer_size = chunk_size;
+	HTTP_G->send.throttle_delay = interval;
+	HTTP_G->send.buffer_size = chunk_size;
 }
 /* }}} */
 
@@ -993,41 +1039,76 @@ PHP_FUNCTION(http_parse_headers)
 }
 /* }}}*/
 
-/* {{{ proto object http_parse_cookie(string cookie)
+/* {{{ proto object http_parse_cookie(string cookie[, int flags[, array allowed_extras]])
  *
  * Parses HTTP cookies like sent in a response into a struct.
  * 
  * Expects a string as parameter containing the value of a Set-Cookie response header.
  * 
- * Returns an stdClass object with the cookie params as properties on success or FALSE on failure.
+ * Returns an stdClass olike shown in the example on success or FALSE on failure.
  * 
  * Example:
  * <pre>
  * <?php
- * print_r(http_parse_cookie("foo=bar; path=/"));
+ * print_r(http_parse_cookie("foo=bar; bar=baz; path=/; domain=example.com; comment=; secure", 0, array("comment")));
  * 
  * stdClass Object
  * (
- *     [name] => foo
- *     [value] => bar
+ *     [cookies] => Array
+ *         (
+ *             [foo] => bar
+ *             [bar] => baz
+ *         )
+ * 
+ *     [extras] => Array
+ *         (
+ *             [comment] =>
+ *         )
+ * 
+ *     [flags] => 16
+ *     [expires] => 0
  *     [path] => /
+ *     [domain] => example.com
  * )
  * ?>
  * </pre> 
  */
 PHP_FUNCTION(http_parse_cookie)
 {
-	char *cookie;
-	int cookie_len;
+	char *cookie, **allowed_extras = NULL;
+	int i = 0, cookie_len;
+	long flags = 0;
+	zval *allowed_extras_array = NULL, **entry = NULL;
+	HashPosition pos;
+	http_cookie_list list;
 	
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &cookie, &cookie_len)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|la", &cookie, &cookie_len, &flags, &allowed_extras_array)) {
 		RETURN_FALSE;
 	}
 	
-	object_init(return_value);
-	if (SUCCESS != http_parse_cookie(cookie, HASH_OF(return_value))) {
-		zval_dtor(return_value);
-		RETURN_FALSE;
+	if (allowed_extras_array) {
+		allowed_extras = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(allowed_extras_array)) + 1, sizeof(char *));
+		FOREACH_VAL(pos, allowed_extras_array, entry) {
+			ZVAL_ADDREF(*entry);
+			convert_to_string_ex(entry);
+			allowed_extras[i] = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry));
+			zval_ptr_dtor(entry);
+		}
+	}
+	
+	if (http_parse_cookie_ex(&list, cookie, flags, allowed_extras)) {
+		object_init(return_value);
+		http_cookie_list_tostruct(&list, return_value);
+		http_cookie_list_dtor(&list);
+	} else {
+		RETVAL_FALSE;
+	}
+	
+	if (allowed_extras) {
+		for (i = 0; allowed_extras[i]; ++i) {
+			efree(allowed_extras[i]);
+		}
+		efree(allowed_extras);
 	}
 }
 
@@ -1162,6 +1243,8 @@ PHP_FUNCTION(http_match_request_header)
  *                      like array("header" => "value")
  *  - cookies:          array, list of cookies as associative array
  *                      like array("cookie" => "value")
+ *  - encodecookies:    bool, whether to urlencode the cookies (default: true)
+ *  - resetcookies:     bool, wheter to reset the cookies
  *  - cookiestore:      string, path to a file where cookies are/will be stored
  *  - resume:           int, byte offset to start the download from;
  *                      if the server supports ranges