From 86540814b3f93c8858575c4651b6b48cb1da8ae2 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Wed, 21 Nov 2012 09:48:28 +0100 Subject: [PATCH] Include the `url' in the http client response. This way, we can get the real url used by the lib, especially when there are query parameters. --- library/network/http_client/src/http_client_response.e | 6 +++++- .../src/spec/libcurl/libcurl_http_client_request.e | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/library/network/http_client/src/http_client_response.e b/library/network/http_client/src/http_client_response.e index f84605ef..1decadb7 100644 --- a/library/network/http_client/src/http_client_response.e +++ b/library/network/http_client/src/http_client_response.e @@ -13,11 +13,12 @@ create feature {NONE} -- Initialization - make + make (a_url: like url) -- Initialize `Current'. do --| Default values status := 200 + url := a_url create {STRING_8} raw_header.make_empty end @@ -36,6 +37,9 @@ feature {HTTP_CLIENT_REQUEST} -- Status setting feature -- Access + url: STRING_8 + -- URL associated with Current response + status: INTEGER assign set_status -- Status code of the response. diff --git a/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e b/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e index 3639649d..17482807 100644 --- a/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e +++ b/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e @@ -207,7 +207,7 @@ feature -- Execution create l_curl_string.make_empty curl_easy.setopt_curl_string (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_writedata, l_curl_string) - create Result.make + create Result.make (l_url) l_result := curl_easy.perform (curl_handle) --| Result @@ -224,7 +224,7 @@ feature -- Execution curl.global_cleanup curl_easy.cleanup (curl_handle) else - create Result.make + create Result.make (url) Result.set_error_occurred (True) end