* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "internet.h"
+#include "config.h"
+
+#include <stdlib.h>
#ifdef HAVE_ZLIB
# include <zlib.h>
#endif
-#include <winternl.h>
+#include "winsock2.h"
+#include "ws2ipdef.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <time.h>
+#include <assert.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wininet.h"
+#include "winerror.h"
+#include "winternl.h"
+#define NO_SHLWAPI_STREAM
+#define NO_SHLWAPI_REG
+#define NO_SHLWAPI_STRFCNS
+#define NO_SHLWAPI_GDI
+#include "shlwapi.h"
+#include "sspi.h"
+#include "wincrypt.h"
+#include "winuser.h"
+
+#include "internet.h"
+#include "wine/debug.h"
+#include "wine/exception.h"
+#include "wine/unicode.h"
-#include <wine/exception.h>
+WINE_DEFAULT_DEBUG_CHANNEL(wininet);
static const WCHAR g_szHttp1_0[] = {'H','T','T','P','/','1','.','0',0};
static const WCHAR g_szHttp1_1[] = {'H','T','T','P','/','1','.','1',0};
static BOOL HTTP_DeleteCustomHeader(http_request_t *req, DWORD index);
static LPWSTR HTTP_build_req( LPCWSTR *list, int len );
static DWORD HTTP_HttpQueryInfoW(http_request_t*, DWORD, LPVOID, LPDWORD, LPDWORD);
-static LPWSTR HTTP_GetRedirectURL(http_request_t *req, LPCWSTR lpszUrl);
static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin);
-static BOOL drain_content(http_request_t*,BOOL);
+static DWORD drain_content(http_request_t*,BOOL);
static CRITICAL_SECTION connection_pool_cs;
static CRITICAL_SECTION_DEBUG connection_pool_debug =
{
0, 0, &connection_pool_cs,
- { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
+ { &connection_pool_debug.ProcessLocksList, &connection_pool_debug.ProcessLocksList },
0, 0, { (DWORD_PTR)(__FILE__ ": connection_pool_cs") }
};
static CRITICAL_SECTION connection_pool_cs = { &connection_pool_debug, -1, 0, 0, 0, 0 };
return TRUE;
}
-server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL is_https, BOOL do_create)
+server_t *get_server(substr_t name, INTERNET_PORT port, BOOL is_https, BOOL do_create)
{
server_t *iter, *server = NULL;
- if(port == INTERNET_INVALID_PORT_NUMBER)
- port = INTERNET_DEFAULT_HTTP_PORT;
-
EnterCriticalSection(&connection_pool_cs);
LIST_FOR_EACH_ENTRY(iter, &connection_pool, server_t, entry) {
- if(iter->port == port && !strcmpW(iter->name, name) && iter->is_https == is_https) {
+ if(iter->port == port && name.len == strlenW(iter->name) && !strncmpiW(iter->name, name.str, name.len)
+ && iter->is_https == is_https) {
server = iter;
server_addref(server);
break;
server->port = port;
server->is_https = is_https;
list_init(&server->conn_pool);
- server->name = heap_strdupW(name);
+ server->name = heap_strndupW(name.str, name.len);
if(server->name && process_host_port(server)) {
list_add_head(&connection_pool, &server->entry);
}else {
return ret;
}
-typedef enum {
- BLOCKING_ALLOW,
- BLOCKING_DISALLOW,
- BLOCKING_WAITALL
-} blocking_mode_t;
-
struct data_stream_vtbl_t {
- DWORD (*get_avail_data)(data_stream_t*,http_request_t*);
BOOL (*end_of_data)(data_stream_t*,http_request_t*);
- DWORD (*read)(data_stream_t*,http_request_t*,BYTE*,DWORD,DWORD*,blocking_mode_t);
- BOOL (*drain_content)(data_stream_t*,http_request_t*);
+ DWORD (*read)(data_stream_t*,http_request_t*,BYTE*,DWORD,DWORD*,BOOL);
+ DWORD (*drain_content)(data_stream_t*,http_request_t*,BOOL);
void (*destroy)(data_stream_t*);
};
DWORD buf_size;
DWORD buf_pos;
DWORD chunk_size;
- BOOL end_of_data;
+
+ enum {
+ CHUNKED_STREAM_STATE_READING_CHUNK_SIZE,
+ CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_SIZE,
+ CHUNKED_STREAM_STATE_READING_CHUNK,
+ CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_DATA,
+ CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END,
+ CHUNKED_STREAM_STATE_END_OF_STREAM,
+ CHUNKED_STREAM_STATE_ERROR
+ } state;
} chunked_stream_t;
static inline void destroy_data_stream(data_stream_t *stream)
BOOL end_of_data;
} gzip_stream_t;
-static DWORD gzip_get_avail_data(data_stream_t *stream, http_request_t *req)
-{
- /* Allow reading only from read buffer */
- return 0;
-}
-
static BOOL gzip_end_of_data(data_stream_t *stream, http_request_t *req)
{
gzip_stream_t *gzip_stream = (gzip_stream_t*)stream;
}
static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD size,
- DWORD *read, blocking_mode_t blocking_mode)
+ DWORD *read, BOOL allow_blocking)
{
gzip_stream_t *gzip_stream = (gzip_stream_t*)stream;
z_stream *zstream = &gzip_stream->zstream;
int zres;
DWORD res = ERROR_SUCCESS;
- TRACE("(%d %d)\n", size, blocking_mode);
+ TRACE("(%d %x)\n", size, allow_blocking);
while(size && !gzip_stream->end_of_data) {
if(!gzip_stream->buf_size) {
gzip_stream->buf_pos = 0;
}
res = gzip_stream->parent_stream->vtbl->read(gzip_stream->parent_stream, req, gzip_stream->buf+gzip_stream->buf_size,
- sizeof(gzip_stream->buf)-gzip_stream->buf_size, ¤t_read, blocking_mode);
- gzip_stream->buf_size += current_read;
+ sizeof(gzip_stream->buf)-gzip_stream->buf_size, ¤t_read, allow_blocking);
if(res != ERROR_SUCCESS)
break;
+ gzip_stream->buf_size += current_read;
if(!current_read) {
- if(blocking_mode != BLOCKING_DISALLOW) {
- WARN("unexpected end of data\n");
- gzip_stream->end_of_data = TRUE;
- }
+ WARN("unexpected end of data\n");
+ gzip_stream->end_of_data = TRUE;
break;
}
}
break;
}
- if(ret_read && blocking_mode == BLOCKING_ALLOW)
- blocking_mode = BLOCKING_DISALLOW;
+ if(ret_read)
+ allow_blocking = FALSE;
}
TRACE("read %u bytes\n", ret_read);
+ if(ret_read)
+ res = ERROR_SUCCESS;
*read = ret_read;
return res;
}
-static BOOL gzip_drain_content(data_stream_t *stream, http_request_t *req)
+static DWORD gzip_drain_content(data_stream_t *stream, http_request_t *req, BOOL allow_blocking)
{
gzip_stream_t *gzip_stream = (gzip_stream_t*)stream;
- return gzip_stream->parent_stream->vtbl->drain_content(gzip_stream->parent_stream, req);
+ return gzip_stream->parent_stream->vtbl->drain_content(gzip_stream->parent_stream, req, allow_blocking);
}
static void gzip_destroy(data_stream_t *stream)
}
static const data_stream_vtbl_t gzip_stream_vtbl = {
- gzip_get_avail_data,
gzip_end_of_data,
gzip_read,
gzip_drain_content,
while((HeaderIndex = HTTP_GetCustomHeaderIndex(request, szSet_Cookie, numCookies++, FALSE)) != -1)
{
const WCHAR *data;
- WCHAR *name;
+ substr_t name;
setCookieHeader = &request->custHeaders[HeaderIndex];
if(!data)
continue;
- name = heap_strndupW(setCookieHeader->lpszValue, data-setCookieHeader->lpszValue);
- if(!name)
- continue;
-
+ name = substr(setCookieHeader->lpszValue, data - setCookieHeader->lpszValue);
data++;
- set_cookie(request->server->name, path, name, data, INTERNET_COOKIE_HTTPONLY);
- heap_free(name);
+ set_cookie(substrz(request->server->name), substrz(path), name, substrz(data), INTERNET_COOKIE_HTTPONLY);
}
LeaveCriticalSection( &request->headers_section );
BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest,
LPCSTR lpszHeader, DWORD dwHeaderLength, DWORD dwModifier)
{
- DWORD len;
- LPWSTR hdr;
+ WCHAR *headers = NULL;
BOOL r;
TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_an(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier);
- len = MultiByteToWideChar( CP_ACP, 0, lpszHeader, dwHeaderLength, NULL, 0 );
- hdr = heap_alloc(len*sizeof(WCHAR));
- MultiByteToWideChar( CP_ACP, 0, lpszHeader, dwHeaderLength, hdr, len );
- if( dwHeaderLength != ~0U )
- dwHeaderLength = len;
+ if(lpszHeader)
+ headers = heap_strndupAtoW(lpszHeader, dwHeaderLength, &dwHeaderLength);
- r = HttpAddRequestHeadersW( hHttpRequest, hdr, dwHeaderLength, dwModifier );
+ r = HttpAddRequestHeadersW(hHttpRequest, headers, dwHeaderLength, dwModifier);
- heap_free( hdr );
+ heap_free(headers);
return r;
}
return url;
}
-static BOOL HTTP_DomainMatches(LPCWSTR server, LPCWSTR domain)
+static BOOL HTTP_DomainMatches(LPCWSTR server, substr_t domain)
{
static const WCHAR localW[] = { '<','l','o','c','a','l','>',0 };
- BOOL ret = FALSE;
+ const WCHAR *dot, *ptr;
+ int len;
- if (!strcmpiW( domain, localW ) && !strchrW( server, '.' ))
- ret = TRUE;
- else if (*domain == '*')
- {
- if (domain[1] == '.')
- {
- LPCWSTR dot;
-
- /* For a hostname to match a wildcard, the last domain must match
- * the wildcard exactly. E.g. if the wildcard is *.a.b, and the
- * hostname is www.foo.a.b, it matches, but a.b does not.
- */
- dot = strchrW( server, '.' );
- if (dot)
- {
- int len = strlenW( dot + 1 );
+ if(domain.len == sizeof(localW)/sizeof(WCHAR)-1 && !strncmpiW(domain.str, localW, domain.len) && !strchrW(server, '.' ))
+ return TRUE;
- if (len > strlenW( domain + 2 ))
- {
- LPCWSTR ptr;
-
- /* The server's domain is longer than the wildcard, so it
- * could be a subdomain. Compare the last portion of the
- * server's domain.
- */
- ptr = dot + len + 1 - strlenW( domain + 2 );
- if (!strcmpiW( ptr, domain + 2 ))
- {
- /* This is only a match if the preceding character is
- * a '.', i.e. that it is a matching domain. E.g.
- * if domain is '*.b.c' and server is 'www.ab.c' they
- * do not match.
- */
- ret = *(ptr - 1) == '.';
- }
- }
- else
- ret = !strcmpiW( dot + 1, domain + 2 );
- }
- }
- }
- else
- ret = !strcmpiW( server, domain );
- return ret;
+ if(domain.len && *domain.str != '*')
+ return domain.len == strlenW(server) && !strncmpiW(server, domain.str, domain.len);
+
+ if(domain.len < 2 || domain.str[1] != '.')
+ return FALSE;
+
+ /* For a hostname to match a wildcard, the last domain must match
+ * the wildcard exactly. E.g. if the wildcard is *.a.b, and the
+ * hostname is www.foo.a.b, it matches, but a.b does not.
+ */
+ dot = strchrW(server, '.');
+ if(!dot)
+ return FALSE;
+
+ len = strlenW(dot + 1);
+ if(len < domain.len - 2)
+ return FALSE;
+
+ /* The server's domain is longer than the wildcard, so it
+ * could be a subdomain. Compare the last portion of the
+ * server's domain.
+ */
+ ptr = dot + 1 + len - domain.len + 2;
+ if(!strncmpiW(ptr, domain.str+2, domain.len-2))
+ /* This is only a match if the preceding character is
+ * a '.', i.e. that it is a matching domain. E.g.
+ * if domain is '*.b.c' and server is 'www.ab.c' they
+ * do not match.
+ */
+ return *(ptr - 1) == '.';
+
+ return len == domain.len-2 && !strncmpiW(dot + 1, domain.str + 2, len);
}
static BOOL HTTP_ShouldBypassProxy(appinfo_t *lpwai, LPCWSTR server)
if (!lpwai->proxyBypass) return FALSE;
ptr = lpwai->proxyBypass;
- do {
+ while(1) {
LPCWSTR tmp = ptr;
ptr = strchrW( ptr, ';' );
if (!ptr)
ptr = strchrW( tmp, ' ' );
- if (ptr)
- {
- if (ptr - tmp < INTERNET_MAX_HOST_NAME_LENGTH)
- {
- WCHAR domain[INTERNET_MAX_HOST_NAME_LENGTH];
-
- memcpy( domain, tmp, (ptr - tmp) * sizeof(WCHAR) );
- domain[ptr - tmp] = 0;
- ret = HTTP_DomainMatches( server, domain );
- }
- ptr += 1;
- }
- else if (*tmp)
- ret = HTTP_DomainMatches( server, tmp );
- } while (ptr && !ret);
+ if (!ptr)
+ ptr = tmp + strlenW(tmp);
+ ret = HTTP_DomainMatches( server, substr(tmp, ptr-tmp) );
+ if (ret || !*ptr)
+ break;
+ ptr++;
+ }
return ret;
}
{
static const WCHAR protoHttp[] = { 'h','t','t','p',0 };
static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 };
- static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',0 };
- WCHAR buf[INTERNET_MAX_HOST_NAME_LENGTH];
- WCHAR protoProxy[INTERNET_MAX_URL_LENGTH];
- DWORD protoProxyLen = INTERNET_MAX_URL_LENGTH;
- WCHAR proxy[INTERNET_MAX_URL_LENGTH];
static WCHAR szNul[] = { 0 };
- URL_COMPONENTSW UrlComponents;
- server_t *new_server;
- BOOL is_https;
+ URL_COMPONENTSW UrlComponents = { sizeof(UrlComponents) };
+ server_t *new_server = NULL;
+ WCHAR *proxy;
- memset( &UrlComponents, 0, sizeof UrlComponents );
- UrlComponents.dwStructSize = sizeof UrlComponents;
- UrlComponents.lpszHostName = buf;
- UrlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH;
-
- if (!INTERNET_FindProxyForProtocol(hIC->proxy, protoHttp, protoProxy, &protoProxyLen))
- return FALSE;
- if( CSTR_EQUAL != CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE,
- protoProxy,strlenW(szHttp),szHttp,strlenW(szHttp)) )
- sprintfW(proxy, szFormat, protoProxy);
- else
- strcpyW(proxy, protoProxy);
- if( !InternetCrackUrlW(proxy, 0, 0, &UrlComponents) )
+ proxy = INTERNET_FindProxyForProtocol(hIC->proxy, protoHttp);
+ if(!proxy)
return FALSE;
- if( UrlComponents.dwHostNameLength == 0 )
- return FALSE;
-
- if( !request->path )
- request->path = szNul;
+ if(CSTR_EQUAL != CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE,
+ proxy, strlenW(szHttp), szHttp, strlenW(szHttp))) {
+ WCHAR *proxy_url = heap_alloc(strlenW(proxy)*sizeof(WCHAR) + sizeof(szHttp));
+ if(!proxy_url) {
+ heap_free(proxy);
+ return FALSE;
+ }
+ strcpyW(proxy_url, szHttp);
+ strcatW(proxy_url, proxy);
+ heap_free(proxy);
+ proxy = proxy_url;
+ }
- is_https = (UrlComponents.nScheme == INTERNET_SCHEME_HTTPS);
- if (is_https && UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER)
- UrlComponents.nPort = INTERNET_DEFAULT_HTTPS_PORT;
+ UrlComponents.dwHostNameLength = 1;
+ if(InternetCrackUrlW(proxy, 0, 0, &UrlComponents) && UrlComponents.dwHostNameLength) {
+ if( !request->path )
+ request->path = szNul;
- new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort, is_https, TRUE);
+ new_server = get_server(substr(UrlComponents.lpszHostName, UrlComponents.dwHostNameLength),
+ UrlComponents.nPort, UrlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE);
+ }
+ heap_free(proxy);
if(!new_server)
return FALSE;
return ERROR_SUCCESS;
}
-static BOOL HTTP_GetRequestURL(http_request_t *req, LPWSTR buf)
+static WCHAR *compose_request_url(http_request_t *req)
{
static const WCHAR http[] = { 'h','t','t','p',':','/','/',0 };
static const WCHAR https[] = { 'h','t','t','p','s',':','/','/',0 };
- static const WCHAR slash[] = { '/',0 };
- LPHTTPHEADERW host_header;
- const WCHAR *host;
- LPCWSTR scheme;
+ const WCHAR *host, *scheme;
+ WCHAR *buf, *ptr;
+ size_t len;
- EnterCriticalSection( &req->headers_section );
-
- host_header = HTTP_GetHeader(req, hostW);
- if (host_header) host = host_header->lpszValue;
- else host = req->server->canon_host_port;
+ host = req->server->canon_host_port;
- if (req->hdr.dwFlags & INTERNET_FLAG_SECURE)
+ if (req->server->is_https)
scheme = https;
else
scheme = http;
- strcpyW(buf, scheme);
- strcatW(buf, host);
- if (req->path[0] != '/')
- strcatW(buf, slash);
- strcatW(buf, req->path);
- LeaveCriticalSection( &req->headers_section );
- return TRUE;
+ len = strlenW(scheme) + strlenW(host) + (req->path[0] != '/' ? 1 : 0) + strlenW(req->path);
+ ptr = buf = heap_alloc((len+1) * sizeof(WCHAR));
+ if(buf) {
+ strcpyW(ptr, scheme);
+ ptr += strlenW(ptr);
+
+ strcpyW(ptr, host);
+ ptr += strlenW(ptr);
+
+ if(req->path[0] != '/')
+ *ptr++ = '/';
+
+ strcpyW(ptr, req->path);
+ ptr += strlenW(ptr);
+ *ptr = 0;
+ }
+
+ return buf;
}
{
http_request_t *req = (http_request_t*)hdr;
- http_release_netconn(req, drain_content(req, FALSE));
+ http_release_netconn(req, drain_content(req, FALSE) == ERROR_SUCCESS);
}
static DWORD str_to_buffer(const WCHAR *str, void *buffer, DWORD *size, BOOL unicode)
return ERROR_SUCCESS;
case INTERNET_OPTION_URL: {
- static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0};
- WCHAR url[INTERNET_MAX_URL_LENGTH];
+ WCHAR *url;
+ DWORD res;
TRACE("INTERNET_OPTION_URL\n");
- strcpyW(url, httpW);
- strcatW(url, req->server->canon_host_port);
- strcatW(url, req->path);
+ url = compose_request_url(req);
+ if(!url)
+ return ERROR_OUTOFMEMORY;
- TRACE("INTERNET_OPTION_URL: %s\n",debugstr_w(url));
- return str_to_buffer(url, buffer, size, unicode);
+ res = str_to_buffer(url, buffer, size, unicode);
+ heap_free(url);
+ return res;
}
case INTERNET_OPTION_USER_AGENT:
return str_to_buffer(req->session->appInfo->agent, buffer, size, unicode);
case INTERNET_OPTION_CACHE_TIMESTAMPS: {
INTERNET_CACHE_ENTRY_INFOW *info;
INTERNET_CACHE_TIMESTAMPS *ts = buffer;
- WCHAR url[INTERNET_MAX_URL_LENGTH];
DWORD nbytes, error;
BOOL ret;
TRACE("INTERNET_OPTION_CACHE_TIMESTAMPS\n");
+ if(!req->req_file)
+ return ERROR_FILE_NOT_FOUND;
+
if (*size < sizeof(*ts))
{
*size = sizeof(*ts);
return ERROR_INSUFFICIENT_BUFFER;
}
+
nbytes = 0;
- HTTP_GetRequestURL(req, url);
- ret = GetUrlCacheEntryInfoW(url, NULL, &nbytes);
+ ret = GetUrlCacheEntryInfoW(req->req_file->url, NULL, &nbytes);
error = GetLastError();
if (!ret && error == ERROR_INSUFFICIENT_BUFFER)
{
if (!(info = heap_alloc(nbytes)))
return ERROR_OUTOFMEMORY;
- GetUrlCacheEntryInfoW(url, info, &nbytes);
+ GetUrlCacheEntryInfoW(req->req_file->url, info, &nbytes);
ts->ftExpires = info->ExpireTime;
ts->ftLastModified = info->LastModifiedTime;
if (!(req->session->appInfo->proxyPassword = heap_strdupW(buffer))) return ERROR_OUTOFMEMORY;
return ERROR_SUCCESS;
- case INTERNET_OPTION_HTTP_DECODING:
- if(size != sizeof(BOOL))
- return ERROR_INVALID_PARAMETER;
- req->decoding = *(BOOL*)buffer;
- return ERROR_SUCCESS;
}
return INET_SetOption(hdr, option, buffer, size);
static void commit_cache_entry(http_request_t *req)
{
- WCHAR url[INTERNET_MAX_URL_LENGTH];
+ WCHAR *header;
+ DWORD header_len;
+ BOOL res;
TRACE("%p\n", req);
CloseHandle(req->hCacheFile);
req->hCacheFile = NULL;
- if(HTTP_GetRequestURL(req, url)) {
- WCHAR *header;
- DWORD header_len;
- BOOL res;
-
- header = build_response_header(req, TRUE);
- header_len = (header ? strlenW(header) : 0);
- res = CommitUrlCacheEntryW(url, req->req_file->file_name, req->expires,
- req->last_modified, NORMAL_CACHE_ENTRY,
- header, header_len, NULL, 0);
- if(res)
- req->req_file->is_committed = TRUE;
- else
- WARN("CommitUrlCacheEntry failed: %u\n", GetLastError());
- heap_free(header);
- }
+ header = build_response_header(req, TRUE);
+ header_len = (header ? strlenW(header) : 0);
+ res = CommitUrlCacheEntryW(req->req_file->url, req->req_file->file_name, req->expires,
+ req->last_modified, NORMAL_CACHE_ENTRY,
+ header, header_len, NULL, 0);
+ if(res)
+ req->req_file->is_committed = TRUE;
+ else
+ WARN("CommitUrlCacheEntry failed: %u\n", GetLastError());
+ heap_free(header);
}
static void create_cache_entry(http_request_t *req)
static const WCHAR no_cacheW[] = {'n','o','-','c','a','c','h','e',0};
static const WCHAR no_storeW[] = {'n','o','-','s','t','o','r','e',0};
- WCHAR url[INTERNET_MAX_URL_LENGTH];
WCHAR file_name[MAX_PATH+1];
+ WCHAR *url;
BOOL b = TRUE;
/* FIXME: We should free previous cache file earlier */
FIXME("INTERNET_FLAG_NEED_FILE is not supported correctly\n");
}
- b = HTTP_GetRequestURL(req, url);
- if(!b) {
+ url = compose_request_url(req);
+ if(!url) {
WARN("Could not get URL\n");
return;
}
}
create_req_file(file_name, &req->req_file);
+ req->req_file->url = url;
req->hCacheFile = CreateFileW(file_name, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE,
NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
return !req->read_size && req->data_stream->vtbl->end_of_data(req->data_stream, req);
}
-static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD *read, blocking_mode_t blocking_mode)
+static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD *read, BOOL allow_blocking)
{
DWORD res;
- res = req->data_stream->vtbl->read(req->data_stream, req, buf, size, read, blocking_mode);
+ res = req->data_stream->vtbl->read(req->data_stream, req, buf, size, read, allow_blocking);
+ if(res != ERROR_SUCCESS)
+ *read = 0;
assert(*read <= size);
if(req->hCacheFile) {
FIXME("WriteFile failed: %u\n", GetLastError());
}
- if(req->data_stream->vtbl->end_of_data(req->data_stream, req))
+ if((res == ERROR_SUCCESS && !*read) || req->data_stream->vtbl->end_of_data(req->data_stream, req))
commit_cache_entry(req);
}
}
/* fetch some more data into the read buffer (the read section must be held) */
-static DWORD refill_read_buffer(http_request_t *req, blocking_mode_t blocking_mode, DWORD *read_bytes)
+static DWORD refill_read_buffer(http_request_t *req, BOOL allow_blocking, DWORD *read_bytes)
{
DWORD res, read=0;
}
res = read_http_stream(req, req->read_buf+req->read_size, sizeof(req->read_buf) - req->read_size,
- &read, blocking_mode);
+ &read, allow_blocking);
+ if(res != ERROR_SUCCESS)
+ return res;
+
req->read_size += read;
TRACE("read %u bytes, read_size %u\n", read, req->read_size);
return res;
}
-/* return the size of data available to be read immediately (the read section must be held) */
-static DWORD get_avail_data( http_request_t *req )
-{
- return req->read_size + req->data_stream->vtbl->get_avail_data(req->data_stream, req);
-}
-
-static DWORD netconn_get_avail_data(data_stream_t *stream, http_request_t *req)
-{
- netconn_stream_t *netconn_stream = (netconn_stream_t*)stream;
- DWORD avail = 0;
-
- if(is_valid_netconn(req->netconn))
- NETCON_query_data_available(req->netconn, &avail);
- return netconn_stream->content_length == ~0u
- ? avail
- : min(avail, netconn_stream->content_length-netconn_stream->content_read);
-}
-
static BOOL netconn_end_of_data(data_stream_t *stream, http_request_t *req)
{
netconn_stream_t *netconn_stream = (netconn_stream_t*)stream;
}
static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD size,
- DWORD *read, blocking_mode_t blocking_mode)
+ DWORD *read, BOOL allow_blocking)
{
netconn_stream_t *netconn_stream = (netconn_stream_t*)stream;
DWORD res = ERROR_SUCCESS;
- int len = 0, ret = 0;
+ int ret = 0;
size = min(size, netconn_stream->content_length-netconn_stream->content_read);
if(size && is_valid_netconn(req->netconn)) {
- while((res = NETCON_recv(req->netconn, buf+ret, size-ret, blocking_mode != BLOCKING_DISALLOW, &len)) == ERROR_SUCCESS) {
- if(!len) {
+ res = NETCON_recv(req->netconn, buf, size, allow_blocking, &ret);
+ if(res == ERROR_SUCCESS) {
+ if(!ret)
netconn_stream->content_length = netconn_stream->content_read;
- break;
- }
- ret += len;
- netconn_stream->content_read += len;
- if(blocking_mode != BLOCKING_WAITALL || size == ret)
- break;
+ netconn_stream->content_read += ret;
}
-
- if(ret || (blocking_mode == BLOCKING_DISALLOW && res == WSAEWOULDBLOCK))
- res = ERROR_SUCCESS;
}
- TRACE("read %u bytes\n", ret);
+ TRACE("res %u read %u bytes\n", res, ret);
*read = ret;
return res;
}
-static BOOL netconn_drain_content(data_stream_t *stream, http_request_t *req)
+static DWORD netconn_drain_content(data_stream_t *stream, http_request_t *req, BOOL allow_blocking)
{
netconn_stream_t *netconn_stream = (netconn_stream_t*)stream;
BYTE buf[1024];
- int len;
+ int len, res;
+ size_t size;
- if(netconn_end_of_data(stream, req))
- return TRUE;
+ if(netconn_stream->content_length == ~0u)
+ return WSAEISCONN;
- do {
- if(NETCON_recv(req->netconn, buf, sizeof(buf), FALSE, &len) != ERROR_SUCCESS)
- return FALSE;
+ while(netconn_stream->content_read < netconn_stream->content_length) {
+ size = min(sizeof(buf), netconn_stream->content_length-netconn_stream->content_read);
+ res = NETCON_recv(req->netconn, buf, size, allow_blocking, &len);
+ if(res)
+ return res;
+ if(!len)
+ return WSAECONNABORTED;
netconn_stream->content_read += len;
- }while(netconn_stream->content_read < netconn_stream->content_length);
+ }
- return TRUE;
+ return ERROR_SUCCESS;
}
static void netconn_destroy(data_stream_t *stream)
}
static const data_stream_vtbl_t netconn_stream_vtbl = {
- netconn_get_avail_data,
netconn_end_of_data,
netconn_read,
netconn_drain_content,
netconn_destroy
};
-/* read some more data into the read buffer (the read section must be held) */
-static DWORD read_more_chunked_data(chunked_stream_t *stream, http_request_t *req, int maxlen)
-{
- DWORD res;
- int len;
-
- assert(!stream->end_of_data);
-
- if (stream->buf_pos)
- {
- /* move existing data to the start of the buffer */
- if(stream->buf_size)
- memmove(stream->buf, stream->buf + stream->buf_pos, stream->buf_size);
- stream->buf_pos = 0;
- }
-
- if (maxlen == -1) maxlen = sizeof(stream->buf);
-
- res = NETCON_recv( req->netconn, stream->buf + stream->buf_size,
- maxlen - stream->buf_size, TRUE, &len );
- if(res == ERROR_SUCCESS)
- stream->buf_size += len;
-
- return res;
-}
-
-/* remove some amount of data from the read buffer (the read section must be held) */
-static void remove_chunked_data(chunked_stream_t *stream, int count)
-{
- if (!(stream->buf_size -= count)) stream->buf_pos = 0;
- else stream->buf_pos += count;
-}
-
-/* discard data contents until we reach end of line (the read section must be held) */
-static DWORD discard_chunked_eol(chunked_stream_t *stream, http_request_t *req)
-{
- DWORD res;
-
- do
- {
- BYTE *eol = memchr(stream->buf + stream->buf_pos, '\n', stream->buf_size);
- if (eol)
- {
- remove_chunked_data(stream, (eol + 1) - (stream->buf + stream->buf_pos));
- break;
- }
- stream->buf_pos = stream->buf_size = 0; /* discard everything */
- if ((res = read_more_chunked_data(stream, req, -1)) != ERROR_SUCCESS) return res;
- } while (stream->buf_size);
- return ERROR_SUCCESS;
-}
-
-/* read the size of the next chunk (the read section must be held) */
-static DWORD start_next_chunk(chunked_stream_t *stream, http_request_t *req)
+static char next_chunked_data_char(chunked_stream_t *stream)
{
- DWORD chunk_size = 0, res;
-
- assert(!stream->chunk_size || stream->chunk_size == ~0u);
-
- if (stream->end_of_data) return ERROR_SUCCESS;
-
- /* read terminator for the previous chunk */
- if(!stream->chunk_size && (res = discard_chunked_eol(stream, req)) != ERROR_SUCCESS)
- return res;
-
- for (;;)
- {
- while (stream->buf_size)
- {
- char ch = stream->buf[stream->buf_pos];
- if (ch >= '0' && ch <= '9') chunk_size = chunk_size * 16 + ch - '0';
- else if (ch >= 'a' && ch <= 'f') chunk_size = chunk_size * 16 + ch - 'a' + 10;
- else if (ch >= 'A' && ch <= 'F') chunk_size = chunk_size * 16 + ch - 'A' + 10;
- else if (ch == ';' || ch == '\r' || ch == '\n')
- {
- TRACE( "reading %u byte chunk\n", chunk_size );
- stream->chunk_size = chunk_size;
- if (req->contentLength == ~0u) req->contentLength = chunk_size;
- else req->contentLength += chunk_size;
-
- /* eat the rest of this line */
- if ((res = discard_chunked_eol(stream, req)) != ERROR_SUCCESS)
- return res;
+ assert(stream->buf_size);
- /* if there's chunk data, return now */
- if (chunk_size) return ERROR_SUCCESS;
-
- /* otherwise, eat the terminator for this chunk */
- if ((res = discard_chunked_eol(stream, req)) != ERROR_SUCCESS)
- return res;
-
- stream->end_of_data = TRUE;
- return ERROR_SUCCESS;
- }
- remove_chunked_data(stream, 1);
- }
- if ((res = read_more_chunked_data(stream, req, -1)) != ERROR_SUCCESS) return res;
- if (!stream->buf_size)
- {
- stream->chunk_size = 0;
- return ERROR_SUCCESS;
- }
- }
-}
-
-static DWORD chunked_get_avail_data(data_stream_t *stream, http_request_t *req)
-{
- /* Allow reading only from read buffer */
- return 0;
+ stream->buf_size--;
+ return stream->buf[stream->buf_pos++];
}
static BOOL chunked_end_of_data(data_stream_t *stream, http_request_t *req)
{
chunked_stream_t *chunked_stream = (chunked_stream_t*)stream;
- return chunked_stream->end_of_data;
+ switch(chunked_stream->state) {
+ case CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END:
+ case CHUNKED_STREAM_STATE_END_OF_STREAM:
+ case CHUNKED_STREAM_STATE_ERROR:
+ return TRUE;
+ default:
+ return FALSE;
+ }
}
static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD size,
- DWORD *read, blocking_mode_t blocking_mode)
+ DWORD *read, BOOL allow_blocking)
{
chunked_stream_t *chunked_stream = (chunked_stream_t*)stream;
- DWORD read_bytes = 0, ret_read = 0, res = ERROR_SUCCESS;
+ DWORD ret_read = 0, res = ERROR_SUCCESS;
+ BOOL continue_read = TRUE;
+ int read_bytes;
+ char ch;
- if(!chunked_stream->chunk_size || chunked_stream->chunk_size == ~0u) {
- res = start_next_chunk(chunked_stream, req);
- if(res != ERROR_SUCCESS)
- return res;
- }
+ do {
+ TRACE("state %d\n", chunked_stream->state);
+
+ /* Ensure that we have data in the buffer for states that need it. */
+ if(!chunked_stream->buf_size) {
+ BOOL blocking_read = allow_blocking;
+
+ switch(chunked_stream->state) {
+ case CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END:
+ case CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_SIZE:
+ /* never allow blocking after 0 chunk size */
+ if(!chunked_stream->chunk_size)
+ blocking_read = FALSE;
+ /* fall through */
+ case CHUNKED_STREAM_STATE_READING_CHUNK_SIZE:
+ case CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_DATA:
+ chunked_stream->buf_pos = 0;
+ res = NETCON_recv(req->netconn, chunked_stream->buf, sizeof(chunked_stream->buf), blocking_read, &read_bytes);
+ if(res == ERROR_SUCCESS && read_bytes) {
+ chunked_stream->buf_size += read_bytes;
+ }else if(res == WSAEWOULDBLOCK) {
+ if(ret_read || allow_blocking)
+ res = ERROR_SUCCESS;
+ continue_read = FALSE;
+ continue;
+ }else {
+ chunked_stream->state = CHUNKED_STREAM_STATE_ERROR;
+ }
+ break;
+ default:
+ break;
+ }
+ }
- while(size && chunked_stream->chunk_size && !chunked_stream->end_of_data) {
- if(chunked_stream->buf_size) {
- read_bytes = min(size, min(chunked_stream->buf_size, chunked_stream->chunk_size));
+ switch(chunked_stream->state) {
+ case CHUNKED_STREAM_STATE_READING_CHUNK_SIZE:
+ ch = next_chunked_data_char(chunked_stream);
+
+ if(ch >= '0' && ch <= '9') {
+ chunked_stream->chunk_size = chunked_stream->chunk_size * 16 + ch - '0';
+ }else if(ch >= 'a' && ch <= 'f') {
+ chunked_stream->chunk_size = chunked_stream->chunk_size * 16 + ch - 'a' + 10;
+ }else if (ch >= 'A' && ch <= 'F') {
+ chunked_stream->chunk_size = chunked_stream->chunk_size * 16 + ch - 'A' + 10;
+ }else if (ch == ';' || ch == '\r' || ch == '\n') {
+ TRACE("reading %u byte chunk\n", chunked_stream->chunk_size);
+ chunked_stream->buf_size++;
+ chunked_stream->buf_pos--;
+ if(req->contentLength == ~0u) req->contentLength = chunked_stream->chunk_size;
+ else req->contentLength += chunked_stream->chunk_size;
+ chunked_stream->state = CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_SIZE;
+ }
+ break;
- /* this could block */
- if(blocking_mode == BLOCKING_DISALLOW && read_bytes == chunked_stream->chunk_size)
- break;
+ case CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_SIZE:
+ ch = next_chunked_data_char(chunked_stream);
+ if(ch == '\n')
+ chunked_stream->state = chunked_stream->chunk_size
+ ? CHUNKED_STREAM_STATE_READING_CHUNK
+ : CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END;
+ else if(ch != '\r')
+ WARN("unexpected char '%c'\n", ch);
+ break;
- memcpy(buf+ret_read, chunked_stream->buf+chunked_stream->buf_pos, read_bytes);
- remove_chunked_data(chunked_stream, read_bytes);
- }else {
+ case CHUNKED_STREAM_STATE_READING_CHUNK:
+ assert(chunked_stream->chunk_size);
+ if(!size) {
+ continue_read = FALSE;
+ break;
+ }
read_bytes = min(size, chunked_stream->chunk_size);
- if(blocking_mode == BLOCKING_DISALLOW) {
- DWORD avail;
+ if(chunked_stream->buf_size) {
+ if(read_bytes > chunked_stream->buf_size)
+ read_bytes = chunked_stream->buf_size;
- if(!is_valid_netconn(req->netconn) || !NETCON_query_data_available(req->netconn, &avail) || !avail)
+ memcpy(buf+ret_read, chunked_stream->buf+chunked_stream->buf_pos, read_bytes);
+ chunked_stream->buf_pos += read_bytes;
+ chunked_stream->buf_size -= read_bytes;
+ }else {
+ res = NETCON_recv(req->netconn, (char*)buf+ret_read, read_bytes,
+ allow_blocking, (int*)&read_bytes);
+ if(res != ERROR_SUCCESS) {
+ continue_read = FALSE;
break;
- if(read_bytes > avail)
- read_bytes = avail;
+ }
- /* this could block */
- if(read_bytes == chunked_stream->chunk_size)
- break;
+ if(!read_bytes) {
+ chunked_stream->state = CHUNKED_STREAM_STATE_ERROR;
+ continue;
+ }
}
- res = NETCON_recv(req->netconn, (char *)buf+ret_read, read_bytes, TRUE, (int*)&read_bytes);
- if(res != ERROR_SUCCESS)
- break;
- }
+ chunked_stream->chunk_size -= read_bytes;
+ size -= read_bytes;
+ ret_read += read_bytes;
+ if(!chunked_stream->chunk_size)
+ chunked_stream->state = CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_DATA;
+ allow_blocking = FALSE;
+ break;
- chunked_stream->chunk_size -= read_bytes;
- size -= read_bytes;
- ret_read += read_bytes;
- if(size && !chunked_stream->chunk_size) {
- assert(blocking_mode != BLOCKING_DISALLOW);
- res = start_next_chunk(chunked_stream, req);
- if(res != ERROR_SUCCESS)
- break;
+ case CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_DATA:
+ ch = next_chunked_data_char(chunked_stream);
+ if(ch == '\n')
+ chunked_stream->state = CHUNKED_STREAM_STATE_READING_CHUNK_SIZE;
+ else if(ch != '\r')
+ WARN("unexpected char '%c'\n", ch);
+ break;
+
+ case CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END:
+ ch = next_chunked_data_char(chunked_stream);
+ if(ch == '\n')
+ chunked_stream->state = CHUNKED_STREAM_STATE_END_OF_STREAM;
+ else if(ch != '\r')
+ WARN("unexpected char '%c'\n", ch);
+ break;
+
+ case CHUNKED_STREAM_STATE_END_OF_STREAM:
+ case CHUNKED_STREAM_STATE_ERROR:
+ continue_read = FALSE;
+ break;
}
+ } while(continue_read);
- if(blocking_mode == BLOCKING_ALLOW)
- blocking_mode = BLOCKING_DISALLOW;
- }
+ if(ret_read)
+ res = ERROR_SUCCESS;
+ if(res != ERROR_SUCCESS)
+ return res;
- TRACE("read %u bytes\n", ret_read);
+ TRACE("read %d bytes\n", ret_read);
*read = ret_read;
- return res;
+ return ERROR_SUCCESS;
}
-static BOOL chunked_drain_content(data_stream_t *stream, http_request_t *req)
+static DWORD chunked_drain_content(data_stream_t *stream, http_request_t *req, BOOL allow_blocking)
{
chunked_stream_t *chunked_stream = (chunked_stream_t*)stream;
+ BYTE buf[1024];
+ DWORD size, res;
+
+ while(chunked_stream->state != CHUNKED_STREAM_STATE_END_OF_STREAM
+ && chunked_stream->state != CHUNKED_STREAM_STATE_ERROR) {
+ res = chunked_read(stream, req, buf, sizeof(buf), &size, allow_blocking);
+ if(res != ERROR_SUCCESS)
+ return res;
+ }
- remove_chunked_data(chunked_stream, chunked_stream->buf_size);
- return chunked_stream->end_of_data;
+ if(chunked_stream->state != CHUNKED_STREAM_STATE_END_OF_STREAM)
+ return ERROR_NO_DATA;
+ return ERROR_SUCCESS;
}
static void chunked_destroy(data_stream_t *stream)
}
static const data_stream_vtbl_t chunked_stream_vtbl = {
- chunked_get_avail_data,
chunked_end_of_data,
chunked_read,
chunked_drain_content,
chunked_stream->data_stream.vtbl = &chunked_stream_vtbl;
chunked_stream->buf_size = chunked_stream->buf_pos = 0;
- chunked_stream->chunk_size = ~0u;
- chunked_stream->end_of_data = FALSE;
+ chunked_stream->chunk_size = 0;
+ chunked_stream->state = CHUNKED_STREAM_STATE_READING_CHUNK_SIZE;
if(request->read_size) {
memcpy(chunked_stream->buf, request->read_buf+request->read_pos, request->read_size);
request->contentLength = ~0u;
}
- if(request->decoding) {
+ if(request->hdr.decoding) {
int encoding_idx;
static const WCHAR deflateW[] = {'d','e','f','l','a','t','e',0};
sizeof(INTERNET_ASYNC_RESULT));
}
-static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD *ret_size)
+static void HTTP_ReceiveRequestData(http_request_t *req)
{
- DWORD res, read = 0, avail = 0;
- blocking_mode_t mode;
+ DWORD res, read = 0;
TRACE("%p\n", req);
EnterCriticalSection( &req->read_section );
- mode = first_notif && req->read_size ? BLOCKING_DISALLOW : BLOCKING_ALLOW;
- res = refill_read_buffer(req, mode, &read);
+ res = refill_read_buffer(req, FALSE, &read);
if(res == ERROR_SUCCESS)
- avail = get_avail_data(req);
+ read += req->read_size;
LeaveCriticalSection( &req->read_section );
- if(res != ERROR_SUCCESS || (mode != BLOCKING_DISALLOW && !read)) {
+ if(res != WSAEWOULDBLOCK && (res != ERROR_SUCCESS || !read)) {
WARN("res %u read %u, closing connection\n", res, read);
http_release_netconn(req, FALSE);
}
- if(res != ERROR_SUCCESS) {
+ if(res != ERROR_SUCCESS && res != WSAEWOULDBLOCK) {
send_request_complete(req, 0, res);
return;
}
- if(ret_size)
- *ret_size = avail;
- if(first_notif)
- avail = 0;
-
- send_request_complete(req, req->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)req->hdr.hInternet : 1, avail);
+ send_request_complete(req, req->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)req->hdr.hInternet : 1, 0);
}
/* read data from the http connection (the read section must be held) */
-static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD *read, BOOL sync)
+static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD *read, BOOL allow_blocking)
{
DWORD current_read = 0, ret_read = 0;
- blocking_mode_t blocking_mode;
DWORD res = ERROR_SUCCESS;
- blocking_mode = req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC ? BLOCKING_ALLOW : BLOCKING_WAITALL;
-
EnterCriticalSection( &req->read_section );
if(req->read_size) {
memcpy(buffer, req->read_buf+req->read_pos, ret_read);
req->read_size -= ret_read;
req->read_pos += ret_read;
- if(blocking_mode == BLOCKING_ALLOW)
- blocking_mode = BLOCKING_DISALLOW;
+ allow_blocking = FALSE;
}
if(ret_read < size) {
- res = read_http_stream(req, (BYTE*)buffer+ret_read, size-ret_read, ¤t_read, blocking_mode);
- ret_read += current_read;
+ res = read_http_stream(req, (BYTE*)buffer+ret_read, size-ret_read, ¤t_read, allow_blocking);
+ if(res == ERROR_SUCCESS)
+ ret_read += current_read;
+ else if(res == WSAEWOULDBLOCK && ret_read)
+ res = ERROR_SUCCESS;
}
LeaveCriticalSection( &req->read_section );
*read = ret_read;
- TRACE( "retrieved %u bytes (%u)\n", ret_read, req->contentLength );
+ TRACE( "retrieved %u bytes (res %u)\n", ret_read, res );
- if(size && !ret_read)
- http_release_netconn(req, res == ERROR_SUCCESS);
+ if(res != WSAEWOULDBLOCK) {
+ if(res != ERROR_SUCCESS)
+ http_release_netconn(req, FALSE);
+ else if(!ret_read && drain_content(req, FALSE) == ERROR_SUCCESS)
+ http_release_netconn(req, TRUE);
+ }
return res;
}
-static BOOL drain_content(http_request_t *req, BOOL blocking)
+static DWORD drain_content(http_request_t *req, BOOL blocking)
{
- BOOL ret;
-
- if(!is_valid_netconn(req->netconn) || req->contentLength == -1)
- return FALSE;
-
- if(!strcmpW(req->verb, szHEAD))
- return TRUE;
-
- if(!blocking)
- return req->data_stream->vtbl->drain_content(req->data_stream, req);
-
- EnterCriticalSection( &req->read_section );
-
- while(1) {
- DWORD bytes_read, res;
- BYTE buf[4096];
+ DWORD res;
- res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read, TRUE);
- if(res != ERROR_SUCCESS) {
- ret = FALSE;
- break;
- }
- if(!bytes_read) {
- ret = TRUE;
- break;
- }
- }
+ TRACE("%p\n", req->netconn);
- LeaveCriticalSection( &req->read_section );
- return ret;
-}
+ if(!is_valid_netconn(req->netconn))
+ return ERROR_NO_DATA;
-static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read)
-{
- http_request_t *req = (http_request_t*)hdr;
- DWORD res;
+ if(!strcmpW(req->verb, szHEAD))
+ return ERROR_SUCCESS;
EnterCriticalSection( &req->read_section );
- if(hdr->dwError == INTERNET_HANDLE_IN_USE)
- hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR;
-
- res = HTTPREQ_Read(req, buffer, size, read, TRUE);
- if(res == ERROR_SUCCESS)
- res = hdr->dwError;
+ res = req->data_stream->vtbl->drain_content(req->data_stream, req, blocking);
LeaveCriticalSection( &req->read_section );
-
return res;
}
task_header_t hdr;
void *buf;
DWORD size;
+ DWORD read_pos;
DWORD *ret_read;
-} read_file_ex_task_t;
+} read_file_task_t;
-static void AsyncReadFileExProc(task_header_t *hdr)
+static void async_read_file_proc(task_header_t *hdr)
{
- read_file_ex_task_t *task = (read_file_ex_task_t*)hdr;
+ read_file_task_t *task = (read_file_task_t*)hdr;
http_request_t *req = (http_request_t*)task->hdr.hdr;
- DWORD res;
+ DWORD res = ERROR_SUCCESS, read = task->read_pos, complete_arg = 0;
- TRACE("INTERNETREADFILEEXW %p\n", task->hdr.hdr);
+ TRACE("req %p buf %p size %u read_pos %u ret_read %p\n", req, task->buf, task->size, task->read_pos, task->ret_read);
- res = HTTPREQ_Read(req, task->buf, task->size, task->ret_read, TRUE);
- send_request_complete(req, res == ERROR_SUCCESS, res);
-}
+ if(task->buf) {
+ DWORD read_bytes;
+ while (read < task->size) {
+ res = HTTPREQ_Read(req, (char*)task->buf + read, task->size - read, &read_bytes, TRUE);
+ if (res != ERROR_SUCCESS || !read_bytes)
+ break;
+ read += read_bytes;
+ }
+ }else {
+ EnterCriticalSection(&req->read_section);
+ res = refill_read_buffer(req, TRUE, &read);
+ LeaveCriticalSection(&req->read_section);
-static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_read,
- DWORD flags, DWORD_PTR context)
-{
+ if(task->ret_read)
+ complete_arg = read; /* QueryDataAvailable reports read bytes in request complete notification */
+ if(res != ERROR_SUCCESS || !read)
+ http_release_netconn(req, drain_content(req, FALSE) == ERROR_SUCCESS);
+ }
- http_request_t *req = (http_request_t*)hdr;
- DWORD res, read, cread, error = ERROR_SUCCESS;
+ TRACE("res %u read %u\n", res, read);
- if (flags & ~(IRF_ASYNC|IRF_NO_WAIT))
- FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT));
+ if(task->ret_read)
+ *task->ret_read = read;
- INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0);
+ /* FIXME: We should report bytes transferred before decoding content. */
+ INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, &read, sizeof(read));
- if (hdr->dwFlags & INTERNET_FLAG_ASYNC)
- {
- read_file_ex_task_t *task;
+ if(res != ERROR_SUCCESS)
+ complete_arg = res;
+ send_request_complete(req, res == ERROR_SUCCESS, complete_arg);
+}
- if (TryEnterCriticalSection( &req->read_section ))
- {
- if (get_avail_data(req))
- {
- res = HTTPREQ_Read(req, buf, size, &read, FALSE);
- LeaveCriticalSection( &req->read_section );
- goto done;
- }
- LeaveCriticalSection( &req->read_section );
- }
+static DWORD async_read(http_request_t *req, void *buf, DWORD size, DWORD read_pos, DWORD *ret_read)
+{
+ read_file_task_t *task;
- task = alloc_async_task(&req->hdr, AsyncReadFileExProc, sizeof(*task));
- task->buf = buf;
- task->size = size;
- task->ret_read = ret_read;
+ task = alloc_async_task(&req->hdr, async_read_file_proc, sizeof(*task));
+ if(!task)
+ return ERROR_OUTOFMEMORY;
- INTERNET_AsyncCall(&task->hdr);
+ task->buf = buf;
+ task->size = size;
+ task->read_pos = read_pos;
+ task->ret_read = ret_read;
- return ERROR_IO_PENDING;
- }
+ INTERNET_AsyncCall(&task->hdr);
+ return ERROR_IO_PENDING;
+}
- read = 0;
+static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_read,
+ DWORD flags, DWORD_PTR context)
+{
+ http_request_t *req = (http_request_t*)hdr;
+ DWORD res = ERROR_SUCCESS, read = 0, cread, error = ERROR_SUCCESS;
+ BOOL allow_blocking, notify_received = FALSE;
- EnterCriticalSection( &req->read_section );
- if(hdr->dwError == ERROR_SUCCESS)
- hdr->dwError = INTERNET_HANDLE_IN_USE;
- else if(hdr->dwError == INTERNET_HANDLE_IN_USE)
- hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR;
+ TRACE("(%p %p %u %x)\n", req, buf, size, flags);
- while(1) {
- res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread, !(flags & IRF_NO_WAIT));
- if(res != ERROR_SUCCESS)
- break;
+ if (flags & ~(IRF_ASYNC|IRF_NO_WAIT))
+ FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT));
- read += cread;
- if(read == size || end_of_read_data(req))
- break;
+ allow_blocking = !(req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC);
+
+ if(allow_blocking || TryEnterCriticalSection(&req->read_section)) {
+ if(allow_blocking)
+ EnterCriticalSection(&req->read_section);
+ if(hdr->dwError == ERROR_SUCCESS)
+ hdr->dwError = INTERNET_HANDLE_IN_USE;
+ else if(hdr->dwError == INTERNET_HANDLE_IN_USE)
+ hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR;
+
+ if(req->read_size) {
+ read = min(size, req->read_size);
+ memcpy(buf, req->read_buf + req->read_pos, read);
+ req->read_size -= read;
+ req->read_pos += read;
+ }
- LeaveCriticalSection( &req->read_section );
+ if(read < size && (!read || !(flags & IRF_NO_WAIT)) && !end_of_read_data(req)) {
+ LeaveCriticalSection(&req->read_section);
+ INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0);
+ EnterCriticalSection( &req->read_section );
+ notify_received = TRUE;
- INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED,
- &cread, sizeof(cread));
- INTERNET_SendCallback(&req->hdr, req->hdr.dwContext,
- INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0);
+ while(read < size) {
+ res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread, allow_blocking);
+ read += cread;
+ if (res != ERROR_SUCCESS || !cread)
+ break;
+ }
+ }
- EnterCriticalSection( &req->read_section );
- }
+ if(hdr->dwError == INTERNET_HANDLE_IN_USE)
+ hdr->dwError = ERROR_SUCCESS;
+ else
+ error = hdr->dwError;
- if(hdr->dwError == INTERNET_HANDLE_IN_USE)
- hdr->dwError = ERROR_SUCCESS;
- else
- error = hdr->dwError;
+ LeaveCriticalSection( &req->read_section );
+ }else {
+ res = WSAEWOULDBLOCK;
+ }
- LeaveCriticalSection( &req->read_section );
+ if(res == WSAEWOULDBLOCK) {
+ if(!(flags & IRF_NO_WAIT))
+ return async_read(req, buf, size, read, ret_read);
+ if(!read)
+ return async_read(req, NULL, 0, 0, NULL);
+ res = ERROR_SUCCESS;
+ }
-done:
*ret_read = read;
- if (res == ERROR_SUCCESS) {
+ if (res != ERROR_SUCCESS)
+ return res;
+
+ if(notify_received)
INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED,
&read, sizeof(read));
- }
-
- return res==ERROR_SUCCESS ? error : res;
+ return error;
}
static DWORD HTTPREQ_WriteFile(object_header_t *hdr, const void *buffer, DWORD size, DWORD *written)
return res;
}
-typedef struct {
- task_header_t hdr;
- DWORD *ret_size;
-} http_data_available_task_t;
-
-static void AsyncQueryDataAvailableProc(task_header_t *hdr)
-{
- http_data_available_task_t *task = (http_data_available_task_t*)hdr;
-
- HTTP_ReceiveRequestData((http_request_t*)task->hdr.hdr, FALSE, task->ret_size);
-}
-
static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available, DWORD flags, DWORD_PTR ctx)
{
http_request_t *req = (http_request_t*)hdr;
+ DWORD res = ERROR_SUCCESS, avail = 0, error = ERROR_SUCCESS;
+ BOOL allow_blocking, notify_received = FALSE;
TRACE("(%p %p %x %lx)\n", req, available, flags, ctx);
- if (req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC)
- {
- http_data_available_task_t *task;
+ if (flags & ~(IRF_ASYNC|IRF_NO_WAIT))
+ FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT));
- /* never wait, if we can't enter the section we queue an async request right away */
- if (TryEnterCriticalSection( &req->read_section ))
- {
- refill_read_buffer(req, BLOCKING_DISALLOW, NULL);
- if ((*available = get_avail_data( req ))) goto done;
- if (end_of_read_data( req )) goto done;
- LeaveCriticalSection( &req->read_section );
- }
+ *available = 0;
+ allow_blocking = !(req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC);
- task = alloc_async_task(&req->hdr, AsyncQueryDataAvailableProc, sizeof(*task));
- task->ret_size = available;
- INTERNET_AsyncCall(&task->hdr);
- return ERROR_IO_PENDING;
- }
+ if(allow_blocking || TryEnterCriticalSection(&req->read_section)) {
+ if(allow_blocking)
+ EnterCriticalSection(&req->read_section);
+ if(hdr->dwError == ERROR_SUCCESS)
+ hdr->dwError = INTERNET_HANDLE_IN_USE;
+ else if(hdr->dwError == INTERNET_HANDLE_IN_USE)
+ hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR;
- EnterCriticalSection( &req->read_section );
+ avail = req->read_size;
- if (!(*available = get_avail_data( req )) && !end_of_read_data( req ))
- {
- refill_read_buffer( req, BLOCKING_ALLOW, NULL );
- *available = get_avail_data( req );
+ if(!avail && !end_of_read_data(req)) {
+ LeaveCriticalSection(&req->read_section);
+ INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0);
+ EnterCriticalSection( &req->read_section );
+ notify_received = TRUE;
+
+ res = refill_read_buffer(req, allow_blocking, &avail);
+ }
+
+ if(hdr->dwError == INTERNET_HANDLE_IN_USE)
+ hdr->dwError = ERROR_SUCCESS;
+ else
+ error = hdr->dwError;
+
+ LeaveCriticalSection( &req->read_section );
+ }else {
+ res = WSAEWOULDBLOCK;
}
-done:
- LeaveCriticalSection( &req->read_section );
+ if(res == WSAEWOULDBLOCK)
+ return async_read(req, NULL, 0, 0, available);
- TRACE( "returning %u\n", *available );
- return ERROR_SUCCESS;
+ if (res != ERROR_SUCCESS)
+ return res;
+
+ *available = avail;
+ if(notify_received)
+ INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED,
+ &avail, sizeof(avail));
+ return error;
}
static DWORD HTTPREQ_LockRequestFile(object_header_t *hdr, req_file_t **ret)
HTTPREQ_QueryOption,
HTTPREQ_SetOption,
HTTPREQ_ReadFile,
- HTTPREQ_ReadFileEx,
HTTPREQ_WriteFile,
HTTPREQ_QueryDataAvailable,
NULL,
{
appinfo_t *hIC = session->appInfo;
http_request_t *request;
- DWORD len;
+ DWORD port, len;
TRACE("-->\n");
request->hdr.htype = WH_HHTTPREQ;
request->hdr.dwFlags = dwFlags;
request->hdr.dwContext = dwContext;
+ request->hdr.decoding = session->hdr.decoding;
request->contentLength = ~0u;
request->netconn_stream.data_stream.vtbl = &netconn_stream_vtbl;
request->session = session;
list_add_head( &session->hdr.children, &request->hdr.entry );
- request->server = get_server(session->hostName, session->hostPort, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE);
+ port = session->hostPort;
+ if (port == INTERNET_INVALID_PORT_NUMBER)
+ port = (session->hdr.dwFlags & INTERNET_FLAG_SECURE) ?
+ INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT;
+
+ request->server = get_server(substrz(session->hostName), port, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE);
if(!request->server) {
WININET_Release(&request->hdr);
return ERROR_OUTOFMEMORY;
if (lpszObjectName && *lpszObjectName) {
HRESULT rc;
+ WCHAR dummy;
- len = 0;
- rc = UrlEscapeW(lpszObjectName, NULL, &len, URL_ESCAPE_SPACES_ONLY);
+ len = 1;
+ rc = UrlCanonicalizeW(lpszObjectName, &dummy, &len, URL_ESCAPE_SPACES_ONLY);
if (rc != E_POINTER)
len = strlenW(lpszObjectName)+1;
request->path = heap_alloc(len*sizeof(WCHAR));
- rc = UrlEscapeW(lpszObjectName, request->path, &len,
+ rc = UrlCanonicalizeW(lpszObjectName, request->path, &len,
URL_ESCAPE_SPACES_ONLY);
if (rc != S_OK)
{
return result;
}
-/***********************************************************************
- * HTTP_GetRedirectURL (internal)
- */
-static LPWSTR HTTP_GetRedirectURL(http_request_t *request, LPCWSTR lpszUrl)
+static WCHAR *get_redirect_url(http_request_t *request)
{
static WCHAR szHttp[] = {'h','t','t','p',0};
static WCHAR szHttps[] = {'h','t','t','p','s',0};
http_session_t *session = request->session;
- URL_COMPONENTSW urlComponents;
- DWORD url_length = 0;
- LPWSTR orig_url;
- LPWSTR combined_url;
+ URL_COMPONENTSW urlComponents = { sizeof(urlComponents) };
+ WCHAR *orig_url = NULL, *redirect_url = NULL, *combined_url = NULL;
+ DWORD url_length = 0, res;
+ BOOL b;
+
+ url_length = 0;
+ res = HTTP_HttpQueryInfoW(request, HTTP_QUERY_LOCATION, redirect_url, &url_length, NULL);
+ if(res == ERROR_INSUFFICIENT_BUFFER) {
+ redirect_url = heap_alloc(url_length);
+ res = HTTP_HttpQueryInfoW(request, HTTP_QUERY_LOCATION, redirect_url, &url_length, NULL);
+ }
+ if(res != ERROR_SUCCESS) {
+ heap_free(redirect_url);
+ return NULL;
+ }
+
+ urlComponents.dwSchemeLength = 1;
+ b = InternetCrackUrlW(redirect_url, url_length / sizeof(WCHAR), 0, &urlComponents);
+ if(b && urlComponents.dwSchemeLength &&
+ urlComponents.nScheme != INTERNET_SCHEME_HTTP && urlComponents.nScheme != INTERNET_SCHEME_HTTPS) {
+ TRACE("redirect to non-http URL\n");
+ return NULL;
+ }
- urlComponents.dwStructSize = sizeof(URL_COMPONENTSW);
urlComponents.lpszScheme = (request->hdr.dwFlags & INTERNET_FLAG_SECURE) ? szHttps : szHttp;
urlComponents.dwSchemeLength = 0;
urlComponents.lpszHostName = request->server->name;
- urlComponents.dwHostNameLength = 0;
urlComponents.nPort = request->server->port;
urlComponents.lpszUserName = session->userName;
- urlComponents.dwUserNameLength = 0;
- urlComponents.lpszPassword = NULL;
- urlComponents.dwPasswordLength = 0;
urlComponents.lpszUrlPath = request->path;
- urlComponents.dwUrlPathLength = 0;
- urlComponents.lpszExtraInfo = NULL;
- urlComponents.dwExtraInfoLength = 0;
-
- if (!InternetCreateUrlW(&urlComponents, 0, NULL, &url_length) &&
- (GetLastError() != ERROR_INSUFFICIENT_BUFFER))
- return NULL;
- orig_url = heap_alloc(url_length);
+ b = InternetCreateUrlW(&urlComponents, 0, NULL, &url_length);
+ if(!b && GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
+ orig_url = heap_alloc(url_length);
- /* convert from bytes to characters */
- url_length = url_length / sizeof(WCHAR) - 1;
- if (!InternetCreateUrlW(&urlComponents, 0, orig_url, &url_length))
- {
- heap_free(orig_url);
- return NULL;
+ /* convert from bytes to characters */
+ url_length = url_length / sizeof(WCHAR) - 1;
+ b = InternetCreateUrlW(&urlComponents, 0, orig_url, &url_length);
}
- url_length = 0;
- if (!InternetCombineUrlW(orig_url, lpszUrl, NULL, &url_length, ICU_ENCODE_SPACES_ONLY) &&
- (GetLastError() != ERROR_INSUFFICIENT_BUFFER))
- {
- heap_free(orig_url);
- return NULL;
+ if(b) {
+ url_length = 0;
+ b = InternetCombineUrlW(orig_url, redirect_url, NULL, &url_length, ICU_ENCODE_SPACES_ONLY);
+ if(!b && GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
+ combined_url = heap_alloc(url_length * sizeof(WCHAR));
+ b = InternetCombineUrlW(orig_url, redirect_url, combined_url, &url_length, ICU_ENCODE_SPACES_ONLY);
+ if(!b) {
+ heap_free(combined_url);
+ combined_url = NULL;
+ }
+ }
}
- combined_url = heap_alloc(url_length * sizeof(WCHAR));
- if (!InternetCombineUrlW(orig_url, lpszUrl, combined_url, &url_length, ICU_ENCODE_SPACES_ONLY))
- {
- heap_free(orig_url);
- heap_free(combined_url);
- return NULL;
- }
heap_free(orig_url);
+ heap_free(redirect_url);
return combined_url;
}
/***********************************************************************
* HTTP_HandleRedirect (internal)
*/
-static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl)
+static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url)
{
+ URL_COMPONENTSW urlComponents = { sizeof(urlComponents) };
http_session_t *session = request->session;
- WCHAR path[INTERNET_MAX_PATH_LENGTH];
+ size_t url_len = strlenW(url);
- if(lpszUrl[0]=='/')
+ if(url[0] == '/')
{
/* if it's an absolute path, keep the same session info */
- lstrcpynW(path, lpszUrl, INTERNET_MAX_URL_LENGTH);
+ urlComponents.lpszUrlPath = url;
+ urlComponents.dwUrlPathLength = url_len;
}
else
{
- URL_COMPONENTSW urlComponents;
- WCHAR protocol[INTERNET_MAX_SCHEME_LENGTH];
- WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH];
- WCHAR userName[INTERNET_MAX_USER_NAME_LENGTH];
- BOOL custom_port = FALSE;
-
- static const WCHAR httpW[] = {'h','t','t','p',0};
- static const WCHAR httpsW[] = {'h','t','t','p','s',0};
-
- userName[0] = 0;
- hostName[0] = 0;
- protocol[0] = 0;
-
- urlComponents.dwStructSize = sizeof(URL_COMPONENTSW);
- urlComponents.lpszScheme = protocol;
- urlComponents.dwSchemeLength = INTERNET_MAX_SCHEME_LENGTH;
- urlComponents.lpszHostName = hostName;
- urlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH;
- urlComponents.lpszUserName = userName;
- urlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH;
- urlComponents.lpszPassword = NULL;
- urlComponents.dwPasswordLength = 0;
- urlComponents.lpszUrlPath = path;
- urlComponents.dwUrlPathLength = INTERNET_MAX_PATH_LENGTH;
- urlComponents.lpszExtraInfo = NULL;
- urlComponents.dwExtraInfoLength = 0;
- if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents))
+ urlComponents.dwHostNameLength = 1;
+ urlComponents.dwUserNameLength = 1;
+ urlComponents.dwUrlPathLength = 1;
+ if(!InternetCrackUrlW(url, url_len, 0, &urlComponents))
return INTERNET_GetLastError();
- if(!strcmpiW(protocol, httpW)) {
+ if(!urlComponents.dwHostNameLength)
+ return ERROR_INTERNET_INVALID_URL;
+ }
+
+ INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT,
+ url, (url_len + 1) * sizeof(WCHAR));
+
+ if(urlComponents.dwHostNameLength) {
+ BOOL custom_port = FALSE;
+ substr_t host;
+
+ if(urlComponents.nScheme == INTERNET_SCHEME_HTTP) {
if(request->hdr.dwFlags & INTERNET_FLAG_SECURE) {
TRACE("redirect from secure page to non-secure page\n");
/* FIXME: warn about from secure redirect to non-secure page */
request->hdr.dwFlags &= ~INTERNET_FLAG_SECURE;
}
- if(urlComponents.nPort == INTERNET_INVALID_PORT_NUMBER)
- urlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT;
- else if(urlComponents.nPort != INTERNET_DEFAULT_HTTP_PORT)
- custom_port = TRUE;
- }else if(!strcmpiW(protocol, httpsW)) {
+ custom_port = urlComponents.nPort != INTERNET_DEFAULT_HTTP_PORT;
+ }else if(urlComponents.nScheme == INTERNET_SCHEME_HTTPS) {
if(!(request->hdr.dwFlags & INTERNET_FLAG_SECURE)) {
TRACE("redirect from non-secure page to secure page\n");
/* FIXME: notify about redirect to secure page */
request->hdr.dwFlags |= INTERNET_FLAG_SECURE;
}
- if(urlComponents.nPort == INTERNET_INVALID_PORT_NUMBER)
- urlComponents.nPort = INTERNET_DEFAULT_HTTPS_PORT;
- else if(urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT)
- custom_port = TRUE;
+ custom_port = urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT;
}
heap_free(session->hostName);
- session->hostName = heap_strdupW(hostName);
+ session->hostName = heap_strndupW(urlComponents.lpszHostName, urlComponents.dwHostNameLength);
session->hostPort = urlComponents.nPort;
heap_free(session->userName);
session->userName = NULL;
- if (userName[0])
- session->userName = heap_strdupW(userName);
+ if (urlComponents.dwUserNameLength)
+ session->userName = heap_strndupW(urlComponents.lpszUserName, urlComponents.dwUserNameLength);
reset_data_stream(request);
- if(strcmpiW(request->server->name, hostName) || request->server->port != urlComponents.nPort) {
+ host = substr(urlComponents.lpszHostName, urlComponents.dwHostNameLength);
+
+ if(host.len != strlenW(request->server->name) || strncmpiW(request->server->name, host.str, host.len)
+ || request->server->port != urlComponents.nPort) {
server_t *new_server;
- new_server = get_server(hostName, urlComponents.nPort, urlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE);
+ new_server = get_server(host, urlComponents.nPort, urlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE);
server_release(request->server);
request->server = new_server;
}
else
HTTP_ProcessHeader(request, hostW, request->server->name, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ);
}
+
heap_free(request->path);
- request->path=NULL;
- if (*path)
+ request->path = NULL;
+ if(urlComponents.dwUrlPathLength)
{
- DWORD needed = 0;
+ DWORD needed = 1;
HRESULT rc;
+ WCHAR dummy = 0;
+ WCHAR *path;
- rc = UrlEscapeW(path, NULL, &needed, URL_ESCAPE_SPACES_ONLY);
+ path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength);
+ rc = UrlEscapeW(path, &dummy, &needed, URL_ESCAPE_SPACES_ONLY);
if (rc != E_POINTER)
- needed = strlenW(path)+1;
+ ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc);
request->path = heap_alloc(needed*sizeof(WCHAR));
rc = UrlEscapeW(path, request->path, &needed,
URL_ESCAPE_SPACES_ONLY);
if (rc != S_OK)
{
ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc);
- strcpyW(request->path,path);
+ strcpyW(request->path, path);
}
+ heap_free(path);
}
/* Remove custom content-type/length headers on redirects. */
while (isspaceW(*ptr))
ptr++;
- for (monthPtr = month; !isspace(*ptr) &&
+ for (monthPtr = month; !isspaceW(*ptr) &&
monthPtr - month < sizeof(month) / sizeof(month[0]) - 1;
monthPtr++, ptr++)
*monthPtr = *ptr;
while (isspaceW(*ptr))
ptr++;
- for (monthPtr = month; !isspace(*ptr) &&
+ for (monthPtr = month; !isspaceW(*ptr) &&
monthPtr - month < sizeof(month) / sizeof(month[0]) - 1;
monthPtr++, ptr++)
*monthPtr = *ptr;
netconn_t *netconn = NULL;
DWORD res;
- reset_data_stream(request);
-
if (request->netconn)
{
- if (is_valid_netconn(request->netconn) && NETCON_is_alive(request->netconn))
+ if (NETCON_is_alive(request->netconn) && drain_content(request, TRUE) == ERROR_SUCCESS)
{
+ reset_data_stream(request);
*reusing = TRUE;
return ERROR_SUCCESS;
}
- else
- {
- free_netconn(request->netconn);
- request->netconn = NULL;
- }
+
+ TRACE("freeing netconn\n");
+ free_netconn(request->netconn);
+ request->netconn = NULL;
}
+ reset_data_stream(request);
+
res = HTTP_ResolveName(request);
if(res != ERROR_SUCCESS)
return res;
res = set_content_length(request);
if(res != ERROR_SUCCESS)
goto lend;
- if(!request->contentLength)
+ if(!request->contentLength && !secure_proxy_connect)
http_release_netconn(request, TRUE);
if (!(request->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT) && responseLen)
{
- WCHAR *new_url, szNewLocation[INTERNET_MAX_URL_LENGTH];
- dwBufferSize=sizeof(szNewLocation);
+ WCHAR *new_url;
+
switch(request->status_code) {
case HTTP_STATUS_REDIRECT:
case HTTP_STATUS_MOVED:
case HTTP_STATUS_REDIRECT_KEEP_VERB:
case HTTP_STATUS_REDIRECT_METHOD:
- if(HTTP_HttpQueryInfoW(request,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL) != ERROR_SUCCESS)
+ new_url = get_redirect_url(request);
+ if(!new_url)
break;
if (strcmpW(request->verb, szGET) && strcmpW(request->verb, szHEAD) &&
heap_free(request->verb);
request->verb = heap_strdupW(szGET);
}
- http_release_netconn(request, drain_content(request, FALSE));
- if ((new_url = HTTP_GetRedirectURL( request, szNewLocation )))
- {
- INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT,
- new_url, (strlenW(new_url) + 1) * sizeof(WCHAR));
- res = HTTP_HandleRedirect(request, new_url);
- if (res == ERROR_SUCCESS)
- {
- heap_free(requestString);
- loop_next = TRUE;
- }
- heap_free( new_url );
+ http_release_netconn(request, drain_content(request, FALSE) == ERROR_SUCCESS);
+ res = HTTP_HandleRedirect(request, new_url);
+ heap_free(new_url);
+ if (res == ERROR_SUCCESS) {
+ heap_free(requestString);
+ loop_next = TRUE;
}
redirected = TRUE;
}
request->session->password, host))
{
heap_free(requestString);
- if(!drain_content(request, TRUE)) {
+ if (drain_content(request, TRUE) != ERROR_SUCCESS)
+ {
FIXME("Could not drain content\n");
http_release_netconn(request, FALSE);
}
NULL))
{
heap_free(requestString);
- if(!drain_content(request, TRUE)) {
+ if (drain_content(request, TRUE) != ERROR_SUCCESS)
+ {
FIXME("Could not drain content\n");
http_release_netconn(request, FALSE);
}
remove_header(request, szProxy_Authorization, TRUE);
destroy_authinfo(request->proxyAuthInfo);
request->proxyAuthInfo = NULL;
+ request->contentLength = 0;
+ request->netconn_stream.content_length = 0;
secure_proxy_connect = FALSE;
loop_next = TRUE;
{
if (res == ERROR_SUCCESS) {
if(bEndRequest && request->contentLength && request->bytesWritten == request->bytesToWrite)
- HTTP_ReceiveRequestData(request, TRUE, NULL);
+ HTTP_ReceiveRequestData(request);
else
send_request_complete(request,
request->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)request->hdr.hInternet : 1, 0);
static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_PTR dwContext)
{
- DWORD dwBufferSize;
INT responseLen;
DWORD res = ERROR_SUCCESS;
case HTTP_STATUS_MOVED:
case HTTP_STATUS_REDIRECT_METHOD:
case HTTP_STATUS_REDIRECT_KEEP_VERB: {
- WCHAR *new_url, szNewLocation[INTERNET_MAX_URL_LENGTH];
- dwBufferSize=sizeof(szNewLocation);
- if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_LOCATION, szNewLocation, &dwBufferSize, NULL) != ERROR_SUCCESS)
+ WCHAR *new_url;
+
+ new_url = get_redirect_url(request);
+ if(!new_url)
break;
if (strcmpW(request->verb, szGET) && strcmpW(request->verb, szHEAD) &&
heap_free(request->verb);
request->verb = heap_strdupW(szGET);
}
- http_release_netconn(request, drain_content(request, FALSE));
- if ((new_url = HTTP_GetRedirectURL( request, szNewLocation )))
- {
- INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT,
- new_url, (strlenW(new_url) + 1) * sizeof(WCHAR));
- res = HTTP_HandleRedirect(request, new_url);
- if (res == ERROR_SUCCESS)
- res = HTTP_HttpSendRequestW(request, NULL, 0, NULL, 0, 0, TRUE);
- heap_free( new_url );
- }
+ http_release_netconn(request, drain_content(request, FALSE) == ERROR_SUCCESS);
+ res = HTTP_HandleRedirect(request, new_url);
+ heap_free(new_url);
+ if (res == ERROR_SUCCESS)
+ res = HTTP_HttpSendRequestW(request, NULL, 0, NULL, 0, 0, TRUE);
}
}
}
create_cache_entry(request);
if (res == ERROR_SUCCESS && request->contentLength)
- HTTP_ReceiveRequestData(request, TRUE, NULL);
+ HTTP_ReceiveRequestData(request);
else
send_request_complete(request, res == ERROR_SUCCESS, res);
NULL,
NULL,
NULL,
- NULL,
NULL
};
session->hdr.dwFlags = dwFlags;
session->hdr.dwContext = dwContext;
session->hdr.dwInternalFlags |= dwInternalFlags;
+ session->hdr.decoding = hIC->hdr.decoding;
WININET_AddRef( &hIC->hdr );
session->appInfo = hIC;
projects / reactos.git / blobdiff