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

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2004-2013. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2004-2014. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  HTTP library for KolibriOS                                     ;;
 ;;                                                                 ;;
 ;;   Written by hidnplayr@kolibrios.org                            ;;
 ; "HTTP made really easy", http://www.jmarshall.com/easy/http/
 ; "Hypertext Transfer Protocol -- HTTP/1.1", http://tools.ietf.org/html/rfc2616
         URLMAXLEN       = 65535
-        BUFFERSIZE      = 4096
+        BUFFERSIZE      = 8192
         TIMEOUT         = 1000  ; in 1/100 s
 macro HTTP_init_buffer buffer, socketnum {
         mov     eax, buffer
         push    socketnum
         popd    [eax + http_msg.socket]
-        lea     esi, [eax + http_msg.data]
+        lea     esi, [eax + http_msg.http_header]
         mov     [eax + http_msg.flags], FLAG_CONNECTED
         mov     [eax + http_msg.write_ptr], esi
-        mov     [eax + http_msg.buffer_length], BUFFERSIZE -  http_msg.data
+        mov     [eax + http_msg.buffer_length], BUFFERSIZE -  http_msg.http_header
         mov     [eax + http_msg.chunk_ptr], 0
+        mov     [eax + http_msg.status], 0
-        mov     [eax + http_msg.status], 0
+        mov     [eax + http_msg.header_length], 0
-        mov     [eax + http_msg.header_length], 0
+        mov     [eax + http_msg.content_ptr], 0
         mov     [eax + http_msg.content_length], 0
         mov     [eax + http_msg.content_received], 0
         invoke  ini.get_str, inifile, sec_proxy, key_user, proxyUser, 256, proxyUser
         invoke  ini.get_str, inifile, sec_proxy, key_password, proxyPassword, 256, proxyPassword
         popa
-        DEBUGF  1, "HTTP library: init OK\n"
         DEBUGF  1, "HTTP library: init OK\n"
         xor     eax, eax
         ret
-  .error:
-        DEBUGF  1, "ERROR loading libraries\n"
+  .error:
         DEBUGF  1, "ERROR loading libraries\n"
-        xor     eax, eax
-        inc     eax
+        xor     eax, eax
         invoke  mem.alloc, BUFFERSIZE
         test    eax, eax
         jz      .error
         mov     [buffer], eax
         mov     edi, eax
-        DEBUGF  1, "Buffer has been allocated.\n"
+        DEBUGF  1, "Buffer allocated: 0x%x\n", eax
         mov     esi, str_get
         copy_till_zero
 ;;================================================================================================;;
 proc HTTP_head URL, add_header ;//////////////////////////////////////////////////////////////////;;
 ;;------------------------------------------------------------------------------------------------;;
+;? Initiates a HTTP connection, using 'HEAD' method.                                              ;;
-;? Initiates a HTTP connection, using 'HEAD' method.                                              ;;
+;? This will only return HTTP header and status, no content                                       ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;> URL          = pointer to ASCIIZ URL                                                           ;;
 ;> add_header   = pointer to additional header parameters (ASCIIZ), or null for none.             ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;;================================================================================================;;
 proc HTTP_post URL, add_header, content_type, content_length ;////////////////////////////////////;;
+;;------------------------------------------------------------------------------------------------;;
-;;------------------------------------------------------------------------------------------------;;
+;? Initiates a HTTP connection, using 'POST' method.                                              ;;
-;? Initiates a HTTP connection, using 'GET' method.                                               ;;
+;? This method is used to send data to the HTTP server                                            ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;> URL                  = pointer to ASCIIZ URL                                                   ;;
 ;> add_header           = pointer to additional header parameters (ASCIIZ), or null for none.     ;;
 ; We havent found the (final) header yet, search for it..
   .scan_again:
         ; eax = total number of bytes received so far
         mov     eax, [ebp + http_msg.write_ptr]
-        sub     eax, http_msg.data
+        sub     eax, http_msg.http_header
         sub     eax, ebp
         sub     eax, [ebp + http_msg.header_length]
         ; edi is ptr to begin of header
-        lea     edi, [ebp + http_msg.data]
+        lea     edi, [ebp + http_msg.http_header]
         add     edi, [ebp + http_msg.header_length]
         ; put it in esi for next proc too
         mov     esi, edi
         sub     eax, 3
         dec     eax
         jnz     .scan_loop
         jmp     .need_more_data
   .end_of_header:
-        add     edi, 4 - http_msg.data
+        add     edi, 4 - http_msg.http_header
         sub     edi, ebp
         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
         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.
-        lea     esi, [ebp + http_msg.data]
+        lea     esi, [ebp + http_msg.http_header]
         mov     ecx, [ebp + http_msg.header_length]
   .need_newline:
         inc     esi
         ja      .next_char
         or      byte[esi], 0x20 ; convert to lowercase
         jmp     .next_char
   .convert_done:
         mov     byte[esi-1], 0
-        lea     esi, [ebp + http_msg.data]
+        lea     esi, [ebp + http_msg.http_header]
         DEBUGF  1, "Header names converted to lowercase:\n%s\n", esi
 ; Check for content-length header field.
         stdcall HTTP_find_header_field, ebp, str_cl
   .cl_ok:
         mov     [ebp + http_msg.content_length], edx
-        DEBUGF  1, "Content-length: %u\n", edx
-; Resize buffer according to content-length.
-        add     edx, [ebp + http_msg.header_length]
-        add     edx, http_msg.data
+        DEBUGF  1, "Content-length: %u\n", edx
-        mov     ecx, edx
-        sub     ecx, [ebp + http_msg.write_ptr]
+        test    edx, edx
-        mov     [ebp + http_msg.buffer_length], ecx
+        jz      .got_all_data
-        invoke  mem.realloc, ebp, edx
-        or      eax, eax
-        jz      .no_ram
-  .not_chunked:
-        mov     eax, [ebp + http_msg.write_ptr]
+        call    alloc_contentbuff
-        sub     eax, [ebp + http_msg.header_length]
+        test    eax, eax
-        sub     eax, http_msg.data
+        jz      .no_ram
-        sub     eax, ebp
+        xor     eax, eax
-        jmp     .header_parsed  ; hooray!
+        jmp     .header_parsed
   .no_content:
         DEBUGF  1, "Content-length not found.\n"
+; We didnt find 'content-length', maybe server is using chunked transfer encoding?
+; Try to find 'transfer-encoding' header.
+        stdcall HTTP_find_header_field, ebp, str_te
+        test    eax, eax
+        jnz     .ct_hdr_found
+  .not_chunked:
+        mov     edx, BUFFERSIZE
+        call    alloc_contentbuff
-; We didnt find 'content-length', maybe server is using chunked transfer encoding?
+        test    eax, eax
-; Try to find 'transfer-encoding' header.
+        jz      .no_ram
-        stdcall HTTP_find_header_field, ebp, str_te
+        xor     eax, eax
-        test    eax, eax
+        jmp     .header_parsed
         jz      .not_chunked
         jne     .not_chunked
         or      [ebp + http_msg.flags], FLAG_CHUNKED
+        DEBUGF  1, "Transfer type is: chunked\n"
+        mov     edx, BUFFERSIZE
+        call    alloc_contentbuff
+        test    eax, eax
-        DEBUGF  1, "Transfer type is: chunked\n"
+        jz      .no_ram
-; Set chunk pointer where first chunk should begin.
-        lea     eax, [ebp + http_msg.data]
+; Set chunk pointer where first chunk should begin.
-        add     eax, [ebp + http_msg.header_length]
+        mov     eax, [ebp + http_msg.content_ptr]
         mov     [ebp + http_msg.chunk_ptr], eax
   .chunk_loop:
-        mov     ecx, [ebp + http_msg.write_ptr]

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/http/http.asm – Rev 4241 → 4541