=?UTF-8?Q?Ri=C4=8Dardas=20Barkauskas=20?=: wininet: Check if connection is alive before sending request.
Alexandre Julliard
julliard at winehq.org
Thu Nov 7 14:10:03 CST 2013
Module: wine
Branch: master
Commit: 6c0ee62d7aeeb8933e6b82b2ed1c6b73d89f8e84
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0ee62d7aeeb8933e6b82b2ed1c6b73d89f8e84
Author: Ričardas Barkauskas <rbarkauskas at codeweavers.com>
Date: Thu Nov 7 00:31:06 2013 +0200
wininet: Check if connection is alive before sending request.
---
dlls/wininet/http.c | 6 ++++++
dlls/wininet/tests/http.c | 11 +++++------
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index f7d6650..9c2d5d4 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -4935,6 +4935,12 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,
char *ascii_req;
loop_next = FALSE;
+
+ if (request->netconn && !NETCON_is_alive(request->netconn))
+ {
+ free_netconn(request->netconn);
+ request->netconn = NULL;
+ }
reusing_connection = request->netconn != NULL;
if(redirected) {
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index b2c4c37..7b7a33c 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -2883,22 +2883,21 @@ static void test_connection_closing(int port)
CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT);
CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY);
- todo_wine CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER);
- todo_wine CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER);
+ CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER);
+ CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER);
CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST);
CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT);
CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE);
CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED);
CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE);
- test_status_code_todo(req, 210);
+ test_status_code(req, 210);
SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT);
SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY);
SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER);
SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER);
SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST);
- SET_WINE_ALLOW(INTERNET_STATUS_SENDING_REQUEST);
SET_EXPECT(INTERNET_STATUS_REQUEST_SENT);
SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE);
SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED);
@@ -2916,7 +2915,7 @@ static void test_connection_closing(int port)
CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY);
CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER);
CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER);
- todo_wine CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST);
+ CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST);
CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT);
CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE);
CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED);
@@ -2924,7 +2923,7 @@ static void test_connection_closing(int port)
CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED);
CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE);
- test_status_code_todo(req, 200);
+ test_status_code(req, 200);
SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION);
SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED);
More information about the wine-cvs
mailing list