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

         mov     [eax + http_msg.chunk_ptr], 0
         mov     [eax + http_msg.status], 0
         mov     [eax + http_msg.header_length], 0
+        mov     [eax + http_msg.content_length], 0
-        mov     [eax + http_msg.content_length], 0
+        mov     [eax + http_msg.content_received], 0
+}
 endp
 ;;================================================================================================;;
-proc HTTP_post URL, content, content_type, content_length ;///////////////////////////////////////;;
+proc HTTP_post URL, content_type, content_length ;////////////////////////////////////////////////;;
 ;;------------------------------------------------------------------------------------------------;;
 ;?                                                                                                ;;
         mcall   send, [socketnum], [buffer]
         test    eax, eax
         jz      .error
         DEBUGF  1, "Request has been sent to server.\n"
-        mcall   send, [socketnum], [content], [content_length]
-        test    eax, eax
-        jz      .error
-        DEBUGF  1, "Data has been sent to server.\n"
         HTTP_init_buffer [buffer], [socketnum]
 ;        mov     eax, [buffer]
 ;;------------------------------------------------------------------------------------------------;;
 ;> _                                                                                              ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;< eax = -1 (not finished) / 0 finished                                                           ;;
 ;;================================================================================================;;
+locals
+        received        dd ?
+endl
         pusha
         mov     ebp, [identifier]
 ; Receive some data
         mov     edi, [ebp + http_msg.write_ptr]
         add     [ebp + http_msg.write_ptr], eax
         sub     [ebp + http_msg.buffer_length], eax
         jz      .got_all_data
+        mov     [received], eax
 ; If data is chunked, combine chunks into contiguous data.
         test    [ebp + http_msg.flags], FLAG_CHUNKED
         jnz     .chunk_loop
   .cl_ok:
         mov     [ebp + http_msg.content_length], edx
         DEBUGF  1, "Content-length: %u\n", edx
 ; Resize buffer according to content-length.
-        mov     eax, [ebp + http_msg.header_length]
-        add     eax, [ebp + http_msg.content_length]
+        add     edx, [ebp + http_msg.header_length]
-        add     eax, http_msg.data
+        add     edx, http_msg.data
-        mov     ecx, eax
+        mov     ecx, edx
         sub     ecx, [ebp + http_msg.write_ptr]
         mov     [ebp + http_msg.buffer_length], ecx
+        invoke  mem.realloc, ebp, edx
+        or      eax, eax
-        invoke  mem.realloc, ebp, eax
+        jz      .no_ram
-        or      eax, eax
+        mov     eax, [received]
-        jz      .no_ram
+        sub     eax, [ebp + http_msg.header_length]
 ; Now move all received data to the left (remove chunk header).
 ; Update content_length accordingly.
         mov     ecx, [ebp + http_msg.write_ptr]
         sub     ecx, esi
-        add     [ebp + http_msg.content_length], ecx
+        add     [ebp + http_msg.content_received], ecx
         rep     movsb
         jmp     .chunk_loop
 ; Check if we got all the data.
   .header_parsed:
-        mov     eax, [ebp + http_msg.header_length]
+        add     [ebp + http_msg.content_received], eax
-        add     eax, [ebp + http_msg.content_length]
+        mov     eax, [ebp + http_msg.content_length]
-        cmp     eax, [ebp + http_msg.buffer_length]
+        cmp     eax, [ebp + http_msg.content_received]
-        je      .got_all_data
+        jae     .got_all_data
   .need_more_data:
         popa
         xor     eax, eax
         dec     eax
         ret
   .need_more_data_chunked:
-        add     [ebp + http_msg.content_length], eax
+        add     [ebp + http_msg.content_received], eax
         popa
         mov     eax, [ebp + http_msg.chunk_ptr]
         sub     eax, [ebp + http_msg.header_length]
         sub     eax, http_msg.data
         sub     eax, ebp
         mov     [ebp + http_msg.content_length], eax
+        mov     [ebp + http_msg.content_received], eax
   .got_all_data:
         DEBUGF  1, "We got all the data! (%u bytes)\n", [ebp + http_msg.content_length]
         or      [ebp + http_msg.flags], FLAG_GOT_DATA
         mcall   close, [ebp + http_msg.socket]
         popa
 ; in: eax = number
 ;     edi = ptr where to store ascii
+ascii_dec:
 ascii_dec:
         push    -'0'
         mov     ecx, 10
   .loop:
         xor     edx, edx
-        div     ecx
-        add     dl, '0'
+        div     ecx
-        mov     byte[edi], dl
+        add     dl, '0'
-        inc     edi
+        push    edx
+        test    eax, eax
+        jnz     .loop
+  .loop2:
+        pop     eax
+        add     al, '0'
+        jz      .done
+        stosb
-        test    eax, eax
+        jmp     .loop2
-        jnz     .loop
+  .done:

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/http/http.asm – Rev 4167 → 4168