[ros-diffs] [akhaldi] 74001: [WININET_WINETEST] Sync with Wine Staging 2.2. CORE-12823

Author: akhaldi
Date: Tue Feb 28 15:52:04 2017
New Revision: 74001

URL: http://svn.reactos.org/svn/reactos?rev=74001&view=rev
Log:
[WININET_WINETEST] Sync with Wine Staging 2.2. CORE-12823

Modified:
    trunk/rostests/winetests/wininet/http.c
    trunk/rostests/winetests/wininet/internet.c

Modified: trunk/rostests/winetests/wininet/http.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?r...
==============================================================================
--- trunk/rostests/winetests/wininet/http.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/wininet/http.c	[iso-8859-1] Tue Feb 28 15:52:04 2017
@@ -2468,6 +2468,10 @@
             send(c, okmsg, sizeof(okmsg)-1, 0);
             send(c, buffer, strlen(buffer), 0);
         }
+        if (strstr(buffer, "GET /test_remove_dot_segments"))
+        {
+            send(c, okmsg, sizeof(okmsg)-1, 0);
+        }
         if (strstr(buffer, "HEAD /test_auth_host1"))
         {
             if (strstr(buffer, "Authorization: Basic dGVzdDE6cGFzcw=="))
@@ -5129,6 +5133,20 @@
     len = strlen(url);
     ok(size == len, "size = %u, expected %u\n", size, len);
     ok(!strcmp(buf, url), "Wrong URL %s, expected %s\n", buf, url);
+
+    close_request(&req);
+}
+
+static void test_remove_dot_segments(int port)
+{
+    test_request_t req;
+    BOOL ret;
+
+    open_simple_request(&req, "localhost", port, NULL, "/A/../B/./C/../../test_remove_dot_segments");
+
+    ret = HttpSendRequestA(req.request, NULL, 0, NULL, 0);
+    ok(ret, "HttpSendRequest failed: %u\n", GetLastError());
+    test_status_code(req.request, 200);

close_request(&req);
 }
@@ -5184,6 +5202,7 @@
     test_async_read(si.port);
     test_http_read(si.port);
     test_long_url(si.port);
+    test_remove_dot_segments(si.port);

/* send the basic request again to shutdown the server thread */
     test_basic_request(si.port, "GET", "/quit");

Modified: trunk/rostests/winetests/wininet/internet.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/internet...
==============================================================================
--- trunk/rostests/winetests/wininet/internet.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/wininet/internet.c	[iso-8859-1] Tue Feb 28 15:52:04 2017
@@ -1202,7 +1202,7 @@
     ok(len != 0, "len = 0\n");

ret = InternetSetOptionA(NULL, INTERNET_OPTION_END_BROWSER_SESSION, NULL, 0);
-    ok(ret, "InternetSetOptio(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError());
+    ok(ret, "InternetSetOption(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError());

len = 1024;
     ret = InternetGetCookieA("http://www.example.com/test_end", NULL, NULL, &len);