WebSVN – Kolibri OS – Diff – /programs/develop/libraries/http/http.asm

         invoke  ini.get_int, inifile, sec_proxy, key_proxyport, 80
         mov     [proxyPort], eax
         invoke  ini.get_str, inifile, sec_proxy, key_user, proxyUser, 256, proxyUser
         invoke  ini.get_str, inifile, sec_proxy, key_password, proxyPassword, 256, proxyPassword
-        DEBUGF  1, "HTTP library: init OK"
+        DEBUGF  1, "HTTP library: init OK\n"
         xor     eax, eax
         ret
   .error:
-        DEBUGF  1, "ERROR loading libraries"
+        DEBUGF  1, "ERROR loading libraries\n"
 ; If data is chunked, combine chunks into contiguous data.
         test    [ebp + http_msg.flags], FLAG_CHUNKED
         jnz     .chunk_loop
-; Did we detect the header yet?
+; Did we detect the (final) header yet?
+        test    [ebp + http_msg.flags], FLAG_GOT_HEADER
+        jnz     .header_parsed
+; We havent found the (final) header yet, search for it..
+  .scan_again:
-        test    [ebp + http_msg.flags], FLAG_GOT_HEADER
+        ; eax = total number of bytes received so far
-        jnz     .header_parsed
+        mov     eax, [ebp + http_msg.write_ptr]
+        sub     eax, http_msg.data
+        sub     eax, ebp
+        sub     eax, [ebp + http_msg.header_length]
+        ; edi is ptr to begin of header
-        push    eax
+        lea     edi, [ebp + http_msg.data]
+        add     edi, [ebp + http_msg.header_length]
-; We havent found the header yet, search for it..
+        ; put it in esi for next proc too
-        sub     eax, 4
+        mov     esi, edi
-        jl      .need_more_data_pop
+        sub     eax, 3
-        inc     eax
+        jle     .need_more_data
-  .scan:
+  .scan_loop:
         ; scan for end of header (empty line)
         cmp     dword[edi], 0x0a0d0a0d                  ; end of header
         je      .end_of_header
-        cmp     word[edi+2], 0x0a0a
+        cmp     word[edi+2], 0x0a0a                     ; notice the use of offset + 2, to calculate header length correctly :)
         je      .end_of_header
         inc     edi
         dec     eax
-        jnz     .scan
+        jnz     .scan_loop
-        jmp     .need_more_data_pop
+        jmp     .need_more_data
-  .end_of_header:
-        add     edi, 4 - http_msg.data
+  .end_of_header:
-        sub     edi, ebp
+        add     edi, 4 - http_msg.data
-        mov     [ebp + http_msg.header_length], edi
+        sub     edi, ebp
-        or      [ebp + http_msg.flags], FLAG_GOT_HEADER
+        mov     [ebp + http_msg.header_length], edi     ; If this isnt the final header, we'll use this as an offset to find real header.
         DEBUGF  1, "Header length: %u\n", edi
 ; Ok, we have found header:
-        cmp     dword[ebp + http_msg.data], 'HTTP'
+        cmp     dword[esi], 'HTTP'
         jne     .invalid_header
-        cmp     dword[ebp + http_msg.data+4], '/1.0'
+        cmp     dword[esi+4], '/1.0'
         je      .http_1.0
-        cmp     dword[ebp + http_msg.data+4], '/1.1'
+        cmp     dword[esi+4], '/1.1'
-        jne     .invalid_header
-        or      [ebp + http_msg.flags], FLAG_HTTP11
+        jne     .invalid_header
-  .http_1.0:
+        or      [ebp + http_msg.flags], FLAG_HTTP11
-        cmp     byte[ebp + http_msg.data+8], ' '
+  .http_1.0:
-        jne     .invalid_header
+        cmp     byte[esi+8], ' '
-        DEBUGF  1, "Header seems valid.\n"
+        jne     .invalid_header
         lea     ebx, [ebx + 4*ebx]
         shl     ebx, 1
         add     ebx, eax
         dec     ecx
         jnz     .statusloop
+; Ignore "100 - Continue" headers
+        cmp     ebx, 100
-        mov     [ebp + http_msg.status], ebx
+        je      .scan_again
         DEBUGF  1, "Status: %u\n", ebx
+        mov     [ebp + http_msg.status], ebx
+        or      [ebp + http_msg.flags], FLAG_GOT_HEADER
 ; Now, convert all header names to lowercase.
 ; This way, it will be much easier to find certain header fields, later on.
         sub     ecx, [ebp + http_msg.write_ptr]
         mov     [ebp + http_msg.buffer_length], ecx
         invoke  mem.realloc, ebp, edx
         or      eax, eax
-        jz      .no_ram_pop
+        jz      .no_ram
+        mov     eax, [ebp + http_msg.write_ptr]
+        sub     eax, [ebp + http_msg.header_length]
-        pop     eax
+        sub     eax, http_msg.data
-        sub     eax, [ebp + http_msg.header_length]
+        sub     eax, ebp
         jmp     .header_parsed  ; hooray!
         jne     .invalid_header
         or      [ebp + http_msg.flags], FLAG_CHUNKED
-        DEBUGF  1, "Transfer type is: chunked\n"
-        pop     eax
+        DEBUGF  1, "Transfer type is: chunked\n"
 ; Set chunk pointer where first chunk should begin.
         lea     eax, [ebp + http_msg.data]
         add     [ebp + http_msg.content_received], eax
         mov     eax, [ebp + http_msg.content_length]
         cmp     eax, [ebp + http_msg.content_received]
         jae     .got_all_data
         jmp     .need_more_data
-  .need_more_data_pop:
-        pop     eax
   .need_more_data:
         popa
         xor     eax, eax
         dec     eax
         ret
         pop     eax
         DEBUGF  1, "ERROR: invalid header\n"
         or      [ebp + http_msg.flags], FLAG_INVALID_HEADER
         jmp     .disconnect
-  .no_ram_pop:
         pop     eax
   .no_ram:
         DEBUGF  1, "ERROR: out of RAM\n"
         or      [ebp + http_msg.flags], FLAG_NO_RAM

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/http/http.asm – Rev 4211 → 4212