- avoid NULL urls

- fix tests

diff --git a/http_request_api.c b/http_request_api.c
index f6ee54eb50bdf04dd0b3d171857a40fb2ea66bf2..d96c1808a9fb4d68b4c02ea4c8230f7786095e97 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -222,7 +222,7 @@ PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch
        memset(r, 0, sizeof(http_request));
        
        r->ch = ch;
-       r->url = (url && *url) ? estrdup(url) : NULL;
+       r->url = (url) ? http_absolute_url(url) : NULL;
        r->meth = (meth > 0) ? meth : HTTP_GET;
        
        phpstr_init(&r->conv.request);

diff --git a/tests/HttpRequestPool_005.phpt b/tests/HttpRequestPool_005.phpt
index 19782674df6f933656d636493f4f4a7362416bab..79c3b0d59378c234f8db9db9fb75ae8df8578081 100644 (file)
--- a/tests/HttpRequestPool_005.phpt
+++ b/tests/HttpRequestPool_005.phpt
@@ -22,26 +22,11 @@ try {
 } catch (HttpRequestPoolException $x) {
        var_dump(count($x->exceptionStack));
 }
-
-try {
-       $p = new HttpRequestPool(new HttpRequest);
-} catch (HttpRequestPoolException $x) {
-       var_dump(count($x->exceptionStack));
-}
-
-try {
-       $p = new HttpRequestPool(new HttpRequest, new HttpRequest);
-} catch (HttpRequestPoolException $x) {
-       var_dump(count($x->exceptionStack));
-}
-
 echo "Done\n";
 ?>
 --EXPECTF--
 %sTEST
 int(2)
 int(4)
-int(1)
-int(2)
 Done
 

diff --git a/tests/exceptions.phpt b/tests/exceptions.phpt
index 61a7620b1d1fdbeaa7a99317b99dce6dfc99e412..1febe33275e33ab9737d1a507c4fc217194fa6eb 100644 (file)
--- a/tests/exceptions.phpt
+++ b/tests/exceptions.phpt
@@ -34,15 +34,6 @@ foreach ($e as $i => $c) {
                printf("%2d: %s\n", $i, get_class($x));
        }
 }
-if (http_support(HTTP_SUPPORT_REQUESTS)) {
-       try {
-               $tmp = http_get(null);
-       } catch (HttpRequestException $x) {
-               printf("%s (%d)\n", $x->getMessage(), $x->getCode());
-       }
-} else {
-       echo "URL using bad/illegal format or missing URL; No URL set!\n ((null)) (8)\n";
-}
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -59,6 +50,4 @@ echo "Done\n";
 10: HttpSocketException
 11: HttpResponseException
 12: HttpUrlException
-URL using bad/illegal format or missing URL; No URL set!
- ((null)) (8)
 Done

diff --git a/tests/ut_HttpUtil.phpt b/tests/ut_HttpUtil.phpt
index 3c5f70ad36ef1a631655374772f07f189d0e6c2c..6bf6e2e9177004916bc2890ba45b118f1a3b199b 100644 (file)
--- a/tests/ut_HttpUtil.phpt
+++ b/tests/ut_HttpUtil.phpt
@@ -100,7 +100,7 @@ class HttpUtilTest extends PHPUnit2_Framework_TestCase
     function test_zlib()
     {
        if ($support = http_support(HTTP_SUPPORT_ENCODINGS)) {
-               $this->assertEquals(file_get_contents(__FILE__), http_gzdecode(http_gzencode(file_get_contents(__FILE__))));
+               $this->assertEquals(file_get_contents(__FILE__), http_inflate(http_deflate(file_get_contents(__FILE__), HTTP_DEFLATE_TYPE_GZIP)));
                $this->assertEquals(file_get_contents(__FILE__), http_inflate(http_deflate(file_get_contents(__FILE__))));
                } else {
                        $this->assertFalse($support);