arnavbhatt288/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

HTTP library: correctly receive content that is not chunked and has unknown content length.

Browse Source 
git-svn-id: svn://kolibrios.org@4220 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2013-11-12 20:08:02 +00:00
parent c6d3f29329
commit bc0823758d
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/develop/libraries/http/examples/downloader.asm
View File

@ -141,7 +141,7 @@ fail:
save: save:
mov ebp, [identifier] mov ebp, [identifier]
mov eax, [ebp + http_msg.content_length] mov eax, [ebp + http_msg.content_received]
mov [final_size], eax mov [final_size], eax
lea ebx, [ebp + http_msg.data] lea ebx, [ebp + http_msg.data]
add ebx, [ebp + http_msg.header_length] add ebx, [ebp + http_msg.header_length]

38
programs/develop/libraries/http/http.asm
View File

@ -447,6 +447,9 @@ proc HTTP_process identifier ;//////////////////////////////////////////////////
[ebp + http_msg.buffer_length], MSG_DONTWAIT [ebp + http_msg.buffer_length], MSG_DONTWAIT
cmp eax, 0xffffffff cmp eax, 0xffffffff
je .check_socket je .check_socket
test eax, eax
jz .server_closed
DEBUGF 1, "Received %u bytes\n", eax DEBUGF 1, "Received %u bytes\n", eax
; Update timestamp ; Update timestamp
@ -616,6 +619,7 @@ proc HTTP_process identifier ;//////////////////////////////////////////////////
or eax, eax or eax, eax
jz .no_ram jz .no_ram
.not_chunked:
mov eax, [ebp + http_msg.write_ptr] mov eax, [ebp + http_msg.write_ptr]
sub eax, [ebp + http_msg.header_length] sub eax, [ebp + http_msg.header_length]
sub eax, http_msg.data sub eax, http_msg.data
@ -629,17 +633,17 @@ proc HTTP_process identifier ;//////////////////////////////////////////////////
; Try to find 'transfer-encoding' header. ; Try to find 'transfer-encoding' header.
stdcall find_header_field, ebp, str_te stdcall find_header_field, ebp, str_te
test eax, eax test eax, eax
jz .invalid_header jz .not_chunked
mov ebx, dword[eax] mov ebx, dword[eax]
or ebx, 0x20202020 or ebx, 0x20202020
cmp ebx, 'chun' cmp ebx, 'chun'
jne .invalid_header jne .not_chunked
mov ebx, dword[eax+4] mov ebx, dword[eax+4]
or ebx, 0x00202020 or ebx, 0x00202020
and ebx, 0x00ffffff and ebx, 0x00ffffff
cmp ebx, 'ked' cmp ebx, 'ked'
jne .invalid_header jne .not_chunked
or [ebp + http_msg.flags], FLAG_CHUNKED or [ebp + http_msg.flags], FLAG_CHUNKED
DEBUGF 1, "Transfer type is: chunked\n" DEBUGF 1, "Transfer type is: chunked\n"
@ -719,10 +723,21 @@ proc HTTP_process identifier ;//////////////////////////////////////////////////
; Check if we got all the data. ; Check if we got all the data.
.header_parsed: .header_parsed:
add [ebp + http_msg.content_received], eax add [ebp + http_msg.content_received], eax
test [ebp + http_msg.flags], FLAG_CONTENT_LENGTH
jz .need_more_data_and_space
mov eax, [ebp + http_msg.content_received] mov eax, [ebp + http_msg.content_received]
cmp eax, [ebp + http_msg.content_length] cmp eax, [ebp + http_msg.content_length]
jae .got_all_data jae .got_all_data
; jmp .need_more_data jmp .need_more_data
.need_more_data_and_space:
mov eax, [ebp + http_msg.write_ptr]
add eax, BUFFERSIZE
sub eax, ebp
invoke mem.realloc, ebp, eax
or eax, eax
jz .no_ram
mov [ebp + http_msg.buffer_length], BUFFERSIZE
.need_more_data: .need_more_data:
popa popa
@ -765,6 +780,19 @@ proc HTTP_process identifier ;//////////////////////////////////////////////////
or [ebp + http_msg.flags], FLAG_TIMEOUT_ERROR or [ebp + http_msg.flags], FLAG_TIMEOUT_ERROR
jmp .disconnect jmp .disconnect
.server_closed:
DEBUGF 1, "server closed connection, transfer complete?\n"
test [ebp + http_msg.flags], FLAG_GOT_HEADER
jz .server_error
test [ebp + http_msg.flags], FLAG_CONTENT_LENGTH
jz .got_all_data
.server_error:
pop eax
DEBUGF 1, "ERROR: server closed connection unexpectedly\n"
or [ebp + http_msg.flags], FLAG_TRANSFER_FAILED
jmp .disconnect
.invalid_header: .invalid_header:
pop eax pop eax
DEBUGF 1, "ERROR: invalid header\n" DEBUGF 1, "ERROR: invalid header\n"
@ -1059,6 +1087,8 @@ endp
;;////////////////////////////////////////////////////////////////////////////////////////////////;; ;;////////////////////////////////////////////////////////////////////////////////////////////////;;
;;================================================================================================;; ;;================================================================================================;;
;! Internal procedures section ;; ;! Internal procedures section ;;
;; ;;
;; NOTICE: These procedures do not follow stdcall conventions and thus may destroy any register. ;;
;;================================================================================================;; ;;================================================================================================;;
;;////////////////////////////////////////////////////////////////////////////////////////////////;; ;;////////////////////////////////////////////////////////////////////////////////////////////////;;
;;================================================================================================;; ;;================================================================================================;;

1
programs/develop/libraries/http/http.inc
View File

@ -25,6 +25,7 @@ FLAG_INVALID_HEADER = 1 shl 16
FLAG_NO_RAM = 1 shl 17 FLAG_NO_RAM = 1 shl 17
FLAG_SOCKET_ERROR = 1 shl 18 FLAG_SOCKET_ERROR = 1 shl 18
FLAG_TIMEOUT_ERROR = 1 shl 19 FLAG_TIMEOUT_ERROR = 1 shl 19
FLAG_TRANSFER_FAILED = 1 shl 20
struc http_msg { struc http_msg {