Changeset 7290 for trunk/src

Timestamp:

Nov 7, 2001, 11:56:15 AM (24 years ago)

Author:

phaller

Message:

.

Location:

trunk/src/wininet

Files:

• http.c (modified) (3 diffs)
• wininet.def (modified) (2 diffs)

trunk/src/wininet/http.c

@@ -15 +15 @@
 #include "debugtools.h"
 #include "winerror.h"
+#include <shlwapi.h>
 #include "winsock.h"
 
@@ -223 +224 @@
     lpwhr->nSocketFD = INVALID_SOCKET;
 
-    if (NULL != lpszObjectName && strlen(lpszObjectName))
-        lpwhr->lpszPath = strdup(lpszObjectName);
+    if (NULL != lpszObjectName && strlen(lpszObjectName)) {
+        DWORD needed = 0;
+        UrlEscapeA(lpszObjectName, NULL, &needed, URL_ESCAPE_SPACES_ONLY);
+        lpwhr->lpszPath = HeapAlloc(GetProcessHeap(), 0, needed);
+        UrlEscapeA(lpszObjectName, lpwhr->lpszPath, &needed,
+                   URL_ESCAPE_SPACES_ONLY);
+    }
 
     if (NULL != lpszReferrer && strlen(lpszReferrer))
@@ -601 +607 @@
     if (NULL == lpwhr->lpszPath)
         lpwhr->lpszPath = strdup("/");
+
+    if(lpwhr->lpszPath[0] != '/') /* not an absolute path ?? --> fix it !! */
+    {
+        char *fixurl = HeapAlloc(GetProcessHeap(), 0, strlen(lpwhr->lpszPath) + 2);
+        *fixurl = '/';
+        strcpy(fixurl + 1, lpwhr->lpszPath);
+        HeapFree( GetProcessHeap(), 0, lpwhr->lpszPath );
+        lpwhr->lpszPath = fixurl;
+    }
 
     /* Calculate length of request string */

trunk/src/wininet/wininet.def

@@ -1 @@
-; $Id: wininet.def,v 1.3 2001-04-01 10:30:32 sandervl Exp $
+; $Id: wininet.def,v 1.4 2001-11-07 10:56:15 phaller Exp $
 
 ;
@@ -7 +7 @@
 DESCRIPTION 'Odin32 System DLL - WinINet'
 DATA MULTIPLE NONSHARED
+
+IMPORTS
+   _UrlEscapeA@16                    = SHLWAPI.691
 
 EXPORTS