From: Michael Wallner Date: Fri, 10 Feb 2006 16:58:51 +0000 (+0000) Subject: - add 'encodecookies' request option (defaults to true) and test X-Git-Tag: RELEASE_0_23_0~22 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=120b03d9b12c4946391584e910d11713006f7018;p=m6w6%2Fext-http - add 'encodecookies' request option (defaults to true) and test - add HttpMessage::reverse() and test --- diff --git a/http_functions.c b/http_functions.c index 907ee92..225019d 100644 --- a/http_functions.c +++ b/http_functions.c @@ -1207,6 +1207,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 diff --git a/http_message_object.c b/http_message_object.c index d275004..5345b26 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -121,6 +121,7 @@ HTTP_EMPTY_ARGS(detach); HTTP_BEGIN_ARGS(prepend, 1) HTTP_ARG_OBJ(HttpMessage, message, 0) HTTP_END_ARGS; +HTTP_EMPTY_ARGS(reverse); #define http_message_object_declare_default_properties() _http_message_object_declare_default_properties(TSRMLS_C) static inline void _http_message_object_declare_default_properties(TSRMLS_D); @@ -176,6 +177,7 @@ zend_function_entry http_message_object_fe[] = { HTTP_MESSAGE_ME(detach, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(prepend, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(reverse, ZEND_ACC_PUBLIC) EMPTY_FUNCTION_ENTRY }; @@ -1241,10 +1243,9 @@ PHP_METHOD(HttpMessage, count) { NO_ARGS { long i; - http_message *msg; getObject(http_message_object, obj); - for (i = 0, msg = obj->message; msg; msg = msg->parent, ++i); + http_message_count(i, obj->message); RETURN_LONG(i); } } @@ -1368,6 +1369,65 @@ PHP_METHOD(HttpMessage, prepend) } /* }}} */ +/* {{{ proto HttpMessage HttpMessage::reverse() + * + * Reorders the message chain in reverse order. + * + * Returns the most parent HttpMessage object. + */ +PHP_METHOD(HttpMessage, reverse) +{ + int i; + getObject(http_message_object, obj); + + NO_ARGS; + + /* count */ + http_message_count(i, obj->message); + + if (i > 1) { + zval o; + zend_object_value *ovalues = NULL; + http_message_object **objects = NULL; + int last = i - 1; + + objects = ecalloc(i, sizeof(http_message_object *)); + ovalues = ecalloc(i, sizeof(zend_object_value)); + + /* we are the first message */ + objects[0] = obj; + ovalues[0] = getThis()->value.obj; + + /* fetch parents */ + INIT_PZVAL(&o); + o.type = IS_OBJECT; + for (i = 1; obj->parent.handle; ++i) { + o.value.obj = obj->parent; + ovalues[i] = o.value.obj; + objects[i] = obj = zend_object_store_get_object(&o TSRMLS_CC); + } + + /* reorder parents */ + for (last = --i; i; --i) { + objects[i]->message->parent = objects[i-1]->message; + objects[i]->parent = ovalues[i-1]; + } + objects[0]->message->parent = NULL; + objects[0]->parent.handle = 0; + objects[0]->parent.handlers = NULL; + + /* add ref (why?) */ + Z_OBJ_ADDREF_P(getThis()); + RETVAL_OBJVAL(ovalues[last], 1); + + efree(objects); + efree(ovalues); + } else { + RETURN_ZVAL(getThis(), 1, 0); + } +} +/* }}} */ + /* {{{ proto void HttpMessage::rewind(void) * * Implements Iterator. diff --git a/http_request_api.c b/http_request_api.c index 308212c..dc83d23 100644 --- a/http_request_api.c +++ b/http_request_api.c @@ -650,9 +650,37 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) { phpstr_dtor(&request->_cache.cookies); if (zend_hash_num_elements(Z_ARRVAL_P(zoption))) { - if (SUCCESS == http_urlencode_hash_recursive(HASH_OF(zoption), &request->_cache.cookies, "; ", sizeof("; ")-1, NULL, 0)) { + zval *urlenc_cookies = NULL; + /* check whether cookies should not be urlencoded; default is to urlencode them */ + if ((!(urlenc_cookies = http_request_option(request, options, "encodecookies", IS_BOOL))) || Z_BVAL_P(urlenc_cookies)) { + if (SUCCESS == http_urlencode_hash_recursive(HASH_OF(zoption), &request->_cache.cookies, "; ", lenof("; "), NULL, 0)) { + phpstr_fix(&request->_cache.cookies); + HTTP_CURL_OPT(CURLOPT_COOKIE, request->_cache.cookies.data); + } + } else { + HashPosition pos; + zval *cookie_val = NULL; + char *cookie_key = NULL; + ulong cookie_idx; + + FOREACH_KEY(pos, zoption, cookie_key, cookie_idx) { + if (cookie_key) { + zval **cookie_val; + if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &cookie_val, &pos)) { + zval *val = zval_copy(IS_STRING, *cookie_val); + phpstr_appendf(&request->_cache.cookies, "%s=%s; ", cookie_key, Z_STRVAL_P(val)); + zval_free(&val); + } + + /* reset */ + cookie_key = NULL; + } + } + phpstr_fix(&request->_cache.cookies); - HTTP_CURL_OPT(CURLOPT_COOKIE, request->_cache.cookies.data); + if (PHPSTR_LEN(&request->_cache.cookies)) { + HTTP_CURL_OPT(CURLOPT_COOKIE, PHPSTR_VAL(&request->_cache.cookies)); + } } } } diff --git a/php_http_message_api.h b/php_http_message_api.h index cf94256..8e90841 100644 --- a/php_http_message_api.h +++ b/php_http_message_api.h @@ -62,6 +62,12 @@ static inline zval *_http_message_header_ex(http_message *msg, char *key_str, si return NULL; } +#define http_message_count(c, m) \ +{ \ + http_message *__tmp_msg = (m); \ + for (c = 0; __tmp_msg; __tmp_msg = __tmp_msg->parent, ++(c)); \ +} + #define http_message_parse(m, l) http_message_parse_ex(NULL, (m), (l)) #define http_message_parse_ex(h, m, l) _http_message_parse_ex((h), (m), (l) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) #define http_message_parse_rel(h, m, l) _http_message_parse_ex((h), (m), (l) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC TSRMLS_CC) diff --git a/php_http_message_object.h b/php_http_message_object.h index 62760f7..3545b45 100644 --- a/php_http_message_object.h +++ b/php_http_message_object.h @@ -106,6 +106,7 @@ PHP_METHOD(HttpMessage, fromString); PHP_METHOD(HttpMessage, detach); PHP_METHOD(HttpMessage, prepend); +PHP_METHOD(HttpMessage, reverse); #endif #endif diff --git a/tests/HttpMessage_007.phpt b/tests/HttpMessage_007.phpt new file mode 100644 index 0000000..f74e956 --- /dev/null +++ b/tests/HttpMessage_007.phpt @@ -0,0 +1,46 @@ +--TEST-- +HttpMessage::reverse() +--SKIPIF-- + +--FILE-- +toString(true); +echo "===\n"; +echo HttpMessage::fromString($s)->reverse()->toString(true); + +$m = new HttpMessage($s); +$r = $m->reverse(); +unset($m); +var_dump($r->count()); +echo $r->toString(true); + +echo "Done\n"; +?> +--EXPECTF-- +%sTEST +GET /first HTTP/1.1 +HTTP/1.1 200 Ok-first +GET /second HTTP/1.1 +HTTP/1.1 200 Ok-second +GET /third HTTP/1.1 +HTTP/1.1 200 Ok-third +=== +HTTP/1.1 200 Ok-third +GET /third HTTP/1.1 +HTTP/1.1 200 Ok-second +GET /second HTTP/1.1 +HTTP/1.1 200 Ok-first +GET /first HTTP/1.1 +int(6) +HTTP/1.1 200 Ok-third +GET /third HTTP/1.1 +HTTP/1.1 200 Ok-second +GET /second HTTP/1.1 +HTTP/1.1 200 Ok-first +GET /first HTTP/1.1 +Done diff --git a/tests/request_cookies.phpt b/tests/request_cookies.phpt new file mode 100644 index 0000000..ef99125 --- /dev/null +++ b/tests/request_cookies.phpt @@ -0,0 +1,52 @@ +--TEST-- +urlencoded cookies +--SKIPIF-- + +--FILE-- + "val=ue"); + +$r = new HttpRequest("http://dev.iworks.at/.print_request.php", HTTP_METH_GET, array("cookies" => $cookies)); +$r->recordHistory = true; +$r->send(); +$r->setOptions(array('encodecookies' => false)); +$r->send(); +echo $r->getHistory()->toString(true); + +echo "Done\n"; +?> +--EXPECTF-- +%sTEST +HTTP/1.1 200 OK +%s + +Array +( + [name] => val=ue +) + +GET /.print_request.php HTTP/1.1 +User-Agent: %s +Host: dev.iworks.at +Accept: */* +Cookie: name=val%3Due +HTTP/1.1 200 OK +%s + +Array +( + [name] => val=ue +) + +GET /.print_request.php HTTP/1.1 +User-Agent: %s +Host: dev.iworks.at +Accept: */* +Cookie: name=val=ue; +Done