Wed, 25 Feb 2026 22:16:20 +0100
fix multiple reads could corrupt the httpclient buffer content
|
662
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3 | * |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
4 | * Copyright 2026 Olaf Wintermann. All rights reserved. |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
5 | * |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
8 | * |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
11 | * |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
15 | * |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
|
662
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
29 | #include "httpclient.h" |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
30 | |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
31 | #include "../util/socket.h" |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
32 | |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
33 | #include <cx/buffer.h> |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
34 | #include <cx/string.h> |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
35 | #include <cx/printf.h> |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
36 | #include <stdlib.h> |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
37 | #include <string.h> |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
38 | #include <errno.h> |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
39 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
40 | static int client_connected(EventHandler *ev, Event *event); |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
41 | static int client_io(EventHandler *ev, Event *event); |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
42 | static int client_finished(EventHandler *ev, Event *event); |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
43 | |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
44 | static int client_send_buf(HttpClient *client); |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
45 | static int client_send_request_body(HttpClient *client); |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
46 | static int client_read_response_header(HttpClient *client); |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
47 | static int client_read_response_body(HttpClient *client); |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
48 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
49 | HttpClient* http_client_new(EventHandler *ev) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
50 | CxMempool *mp = cxMempoolCreate(32, CX_MEMPOOL_TYPE_PURE); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
51 | if(!mp) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
52 | return NULL; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
53 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
54 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
55 | HttpClient *client = malloc(sizeof(HttpClient)); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
56 | HeaderArray *req_headers = header_array_create(); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
57 | HeaderArray *resp_headers = header_array_create(); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
58 | if(!client || !req_headers || !resp_headers) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
59 | free(client); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
60 | header_array_free(req_headers); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
61 | header_array_free(resp_headers); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
62 | cxMempoolFree(mp); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
63 | return NULL; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
64 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
65 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
66 | memset(client, 0, sizeof(HttpClient)); |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
67 | client->ev = ev; |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
68 | client->socketfd = -1; |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
69 | client->request_headers = req_headers; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
70 | client->response_headers = resp_headers; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
71 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
72 | client->buffer.maxsize = HTTP_CLIENT_BUFFER_SIZE; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
73 | client->buffer.inbuf = malloc(HTTP_CLIENT_BUFFER_SIZE); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
74 | HttpParser *parser = http_parser_new2(1, &client->buffer, resp_headers); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
75 | if(!parser || !client->buffer.inbuf) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
76 | http_client_free(client); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
77 | return NULL; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
78 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
79 | client->parser = parser; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
80 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
81 | return client; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
82 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
83 | |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
84 | void http_client_free(HttpClient *client) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
85 | cxMempoolFree(client->mp); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
86 | header_array_free(client->request_headers); |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
87 | http_parser_free(client->parser); |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
88 | if(client->stream) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
89 | client->stream->st.free(&client->stream->st); |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
90 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
91 | free(client->buffer.inbuf); |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
92 | free(client->transfer_buffer); |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
93 | free(client->transfer2_buffer); |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
94 | free(client->addr); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
95 | free(client->method); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
96 | free(client->uri); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
97 | free(client); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
98 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
99 | |
|
700
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
698
diff
changeset
|
100 | int http_client_set_addr(HttpClient *client, int domain, const struct sockaddr *addr, socklen_t addrlen) { |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
101 | free(client->addr); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
102 | client->addr = NULL; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
103 | client->addrlen = 0; |
|
700
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
698
diff
changeset
|
104 | client->domain = domain; |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
105 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
106 | void *newaddr = malloc(addrlen); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
107 | if(!newaddr) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
108 | return 1; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
109 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
110 | memcpy(newaddr, addr, addrlen); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
111 | client->addr = newaddr; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
112 | client->addrlen = addrlen; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
113 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
114 | return 0; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
115 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
116 | |
|
701
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
117 | int http_client_set_socket(HttpClient *client, int socketfd) { |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
118 | client->socketfd = socketfd; |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
119 | if(util_socket_setnonblock(socketfd, 1)) { |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
120 | client->socketfd = -1; |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
121 | return 1; |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
122 | } |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
123 | return 0; |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
124 | } |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
125 | |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
126 | int http_client_set_method(HttpClient *client, const char *method) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
127 | return http_client_set_method_len(client, method, method ? strlen(method) : 0); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
128 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
129 | |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
130 | int http_client_set_uri(HttpClient *client, const char *uri) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
131 | return http_client_set_uri_len(client, uri, uri ? strlen(uri) : 0); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
132 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
133 | |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
134 | static int client_set_str(char **ptr, const char *str, size_t len) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
135 | free(*ptr); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
136 | if(str) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
137 | char *newvalue = malloc(len+1); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
138 | if(!newvalue) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
139 | *ptr = NULL; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
140 | return 1; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
141 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
142 | memcpy(newvalue, str, len); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
143 | newvalue[len] = 0; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
144 | *ptr = newvalue; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
145 | } else { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
146 | *ptr = NULL; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
147 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
148 | return 0; |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
149 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
150 | |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
151 | int http_client_set_method_len(HttpClient *client, const char *method, size_t len) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
152 | return client_set_str(&client->method, method, len); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
153 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
154 | |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
155 | int http_client_set_uri_len(HttpClient *client, const char *uri, size_t len) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
156 | return client_set_str(&client->uri, uri, len); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
157 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
158 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
159 | int http_client_add_request_header(HttpClient *client, cxmutstr name, cxmutstr value) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
160 | return header_array_add(client->request_headers, name, value); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
161 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
162 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
163 | int http_client_add_request_header_copy(HttpClient *client, cxstring name, cxstring value) { |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
164 | if(!client->mp) { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
165 | client->mp = cxMempoolCreate(64, CX_MEMPOOL_TYPE_PURE); |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
166 | if(!client->mp) { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
167 | return 1; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
168 | } |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
169 | } |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
170 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
171 | cxmutstr n = cx_strdup_a(client->mp->allocator, name); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
172 | cxmutstr v = cx_strdup_a(client->mp->allocator, value); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
173 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
174 | int err = 1; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
175 | if(n.ptr && v.ptr) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
176 | err = http_client_add_request_header(client, n, v); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
177 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
178 | if(err) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
179 | cxFree(client->mp->allocator, n.ptr); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
180 | cxFree(client->mp->allocator, v.ptr); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
181 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
182 | return err; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
183 | } |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
184 | |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
185 | int http_client_set_content_length(HttpClient *client, int64_t contentlength) { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
186 | client->req_content_length = contentlength; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
187 | char ctlen_buf[32]; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
188 | size_t len = snprintf(ctlen_buf, 32, "%" PRId64, contentlength); |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
189 | return http_client_add_request_header_copy(client, cx_str("content-length"), cx_strn(ctlen_buf, len)); |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
190 | } |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
191 | |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
192 | int http_client_enable_chunked_transfer_encoding(HttpClient *client) { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
193 | client->req_content_length = -1; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
194 | return http_client_add_request_header(client, cx_mutstr("transfer-encoding"), cx_mutstr("chunked")); |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
195 | } |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
196 | |
|
704
778dcf4ad63c
fix multiple reads could corrupt the httpclient buffer content
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
703
diff
changeset
|
197 | static int client_start_poll(HttpClient *client) { |
|
701
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
198 | client->event.fn = client_connected; |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
199 | client->event.finish = client_finished; |
|
704
778dcf4ad63c
fix multiple reads could corrupt the httpclient buffer content
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
703
diff
changeset
|
200 | return ev_poll(client->ev, client->socketfd, &client->event); |
|
701
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
201 | } |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
202 | |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
203 | int http_client_start(HttpClient *client) { |
|
704
778dcf4ad63c
fix multiple reads could corrupt the httpclient buffer content
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
703
diff
changeset
|
204 | client->event.events = EVENT_POLLOUT; |
|
701
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
205 | client->event.cookie = client; |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
206 | if(client->socketfd != -1) { |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
207 | int ret = client_connected(client->ev, &client->event); |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
208 | if(ret != 0) { |
|
704
778dcf4ad63c
fix multiple reads could corrupt the httpclient buffer content
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
703
diff
changeset
|
209 | return client_start_poll(client); |
|
701
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
210 | } |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
211 | return 0; |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
212 | } |
|
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
213 | |
|
700
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
698
diff
changeset
|
214 | int socketfd = socket(client->domain, SOCK_STREAM, 0); |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
215 | if(socketfd < 0) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
216 | return 1; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
217 | } |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
218 | if(util_socket_setnonblock(socketfd, 1)) { |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
219 | return 1; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
220 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
221 | client->socketfd = socketfd; |
|
704
778dcf4ad63c
fix multiple reads could corrupt the httpclient buffer content
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
703
diff
changeset
|
222 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
223 | int ret = 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
224 | if(connect(socketfd, client->addr, client->addrlen)) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
225 | int err = errno; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
226 | if(err == EINPROGRESS) { |
|
704
778dcf4ad63c
fix multiple reads could corrupt the httpclient buffer content
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
703
diff
changeset
|
227 | ret = client_start_poll(client); |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
228 | } else { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
229 | log_ereport(LOG_FAILURE, "http-client-start: connect failed: %s", strerror(err)); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
230 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
231 | } else { |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
232 | ret = 0; // TODO |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
233 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
234 | |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
235 | if(ret) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
236 | close(socketfd); |
|
701
936e5487418a
add first full httpclient test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
237 | client->socketfd = -1; |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
238 | } |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
239 | return ret; |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
240 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
241 | |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
242 | int http_client_process(HttpClient *client) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
243 | return client_io(client->ev, &client->event); |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
244 | } |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
245 | |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
246 | size_t http_client_message_buf_size_available(HttpClient *client) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
247 | return client->transfer_buffer_alloc - client->transfer_buffer_len; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
248 | } |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
249 | |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
250 | int http_client_add_message(HttpClient *client, const void *buf, size_t size) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
251 | size_t available = http_client_message_buf_size_available(client); |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
252 | if(available == 0) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
253 | return HTTP_CLIENT_CALLBACK_WOULD_BLOCK; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
254 | } |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
255 | if(size > available) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
256 | size = available; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
257 | } |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
258 | memcpy(client->transfer_buffer + client->transfer_buffer_len, buf, size); |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
259 | return size; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
260 | } |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
261 | |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
262 | static int create_req_buffer(HttpClient *client) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
263 | CxBuffer buf; |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
264 | if(cxBufferInit(&buf, cxDefaultAllocator, NULL, HTTP_CLIENT_BUFFER_SIZE, CX_BUFFER_AUTO_EXTEND)) { |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
265 | return 1; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
266 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
267 | |
|
668
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
268 | if(client->method) { |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
269 | cxBufferPutString(&buf, "GET "); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
270 | } else { |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
271 | cxBufferPutString(&buf, client->method); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
272 | } |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
273 | cxBufferPutString(&buf, client->uri ? client->uri : "/"); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
274 | cxBufferPutString(&buf, " HTTP/1.1\r\n"); |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
275 | |
|
668
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
276 | HeaderArray *hdr = client->request_headers; |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
277 | while(hdr) { |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
278 | for(int i=0;i<hdr->len;i++) { |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
279 | cxBufferPutString(&buf, hdr->headers[i].name); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
280 | cxBufferPutString(&buf, ": "); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
281 | cxBufferPutString(&buf, hdr->headers[i].value); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
282 | cxBufferPutString(&buf, "\r\n"); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
283 | } |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
284 | hdr = hdr->next; |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
285 | } |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
286 | cxBufferPutString(&buf, "\r\n"); |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
287 | client->transfer_buffer = buf.space; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
288 | client->transfer_buffer_alloc = buf.capacity; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
289 | client->transfer_buffer_len = buf.size; |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
290 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
291 | return 0; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
292 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
293 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
294 | static int client_connected(EventHandler *ev, Event *event) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
295 | HttpClient *client = event->cookie; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
296 | if(create_req_buffer(client)) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
297 | // TODO: set error |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
298 | return 0; // end |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
299 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
300 | event->fn = client_io; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
301 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
302 | return client_io(ev, event); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
303 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
304 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
305 | static int client_io(EventHandler *ev, Event *event) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
306 | HttpClient *client = event->cookie; |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
307 | if(client->stage == 0) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
308 | if(client->transfer_buffer_pos < client->transfer_buffer_len) { |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
309 | if(client_send_buf(client)) { |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
310 | return client->error == 0; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
311 | } |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
312 | } |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
313 | |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
314 | // do we need to send a request body? |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
315 | if(client->req_content_length != 0) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
316 | if(client_send_request_body(client)) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
317 | return client->error == 0; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
318 | } |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
319 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
320 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
321 | |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
322 | // writing complete, switch to read events |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
323 | event->events = EVENT_POLLIN; |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
324 | client->stage = 1; |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
325 | |
|
704
778dcf4ad63c
fix multiple reads could corrupt the httpclient buffer content
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
703
diff
changeset
|
326 | if(client_read_response_header(client)) { |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
327 | return client->error == 0; |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
328 | } |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
329 | int ret = 0; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
330 | if(client->stage == 2) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
331 | // websocket: write message buffer |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
332 | ret = client_send_buf(client); |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
333 | } |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
334 | if(client_read_response_body(client)) { |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
335 | ret = 1; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
336 | } |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
337 | |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
338 | if(ret) { |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
339 | return client->error == 0; |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
340 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
341 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
342 | return 0; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
343 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
344 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
345 | static int client_finished(EventHandler *ev, Event *event) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
346 | HttpClient *client = event->cookie; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
347 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
348 | close(client->socketfd); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
349 | client->socketfd = -1; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
350 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
351 | // request finished |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
352 | if(client->response_finished) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
353 | client->response_finished(client, client->response_finished_userdata); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
354 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
355 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
356 | return 0; |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
357 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
358 | |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
359 | // sends the content of the transfer buffer to client->socketfd |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
360 | static int client_send_buf(HttpClient *client) { |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
361 | size_t nbytes = client->transfer_buffer_len - client->transfer_buffer_pos; |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
362 | ssize_t w; |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
363 | while((w = write(client->socketfd, client->transfer_buffer + client->transfer_buffer_pos, nbytes)) > 0) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
364 | client->transfer_buffer_pos += w; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
365 | nbytes = client->transfer_buffer_len - client->transfer_buffer_pos; |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
366 | if(nbytes == 0) { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
367 | break; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
368 | } |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
369 | } |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
370 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
371 | if(w <= 0) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
372 | if(errno != EAGAIN) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
373 | // TODO: log correct host |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
374 | log_ereport(LOG_VERBOSE, "http-client %s - %s: write failed: %s", "localhost", client->uri, strerror(errno)); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
375 | client->error = 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
376 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
377 | return 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
378 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
379 | |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
380 | return client->transfer_buffer_pos < client->transfer_buffer_len; |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
381 | } |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
382 | |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
383 | static int client_send_request_body(HttpClient *client) { |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
384 | size_t rbody_readsize = client->transfer_buffer_alloc; |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
385 | size_t rbody_buf_offset = 0; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
386 | if(client->req_content_length == -1) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
387 | // chunked transfer encoding: |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
388 | // don't fill req_buffer completely, reserve some space for |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
389 | // a chunk header, that will be inserted at the beginning |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
390 | rbody_readsize -= 16; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
391 | rbody_buf_offset = 16; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
392 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
393 | while(!client->request_body_complete) { |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
394 | ssize_t r = client->request_body_read(client, client->transfer_buffer + rbody_buf_offset, rbody_readsize, client->request_body_read_userdata); |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
395 | if(r <= 0) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
396 | if(r == HTTP_CLIENT_CALLBACK_WOULD_BLOCK) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
397 | return 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
398 | } else if(r == 0) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
399 | // EOF |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
400 | client->request_body_complete = 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
401 | break; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
402 | } else { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
403 | // error |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
404 | client->error = 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
405 | return 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
406 | } |
|
681
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
407 | } else if(client->req_content_length == -1 && r + 32 < rbody_readsize) { |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
408 | // is it time to terminate the request body? |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
409 | // try read some additional bytes, if it returns 0, we know |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
410 | // the request body is complete and we can add the termination chunk |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
411 | char *r2buf = client->transfer_buffer + rbody_buf_offset + r; |
|
681
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
412 | ssize_t r2 = client->request_body_read(client, r2buf, 32, client->request_body_read_userdata); |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
413 | if(r > 0) { |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
414 | r += r2; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
415 | } else if(r == 0) { |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
416 | memcpy(r2buf, "0\r\n\r\n", 5); |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
417 | r += 5; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
418 | client->request_body_complete = 1; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
419 | client->request_body_terminated = 1; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
420 | } else if(r == HTTP_CLIENT_CALLBACK_WOULD_BLOCK) { |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
421 | return 1; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
422 | } else { |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
423 | client->error = 1; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
424 | return 1; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
425 | } |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
426 | } |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
427 | |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
428 | size_t startpos = 0; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
429 | if(client->req_content_length == -1) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
430 | char chunkheader[16]; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
431 | int chunkheaderlen = snprintf(chunkheader, 16, "%zx\r\n", (size_t)r); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
432 | startpos = 16 - chunkheaderlen; |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
433 | memcpy(client->transfer_buffer + startpos, chunkheader, chunkheaderlen); |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
434 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
435 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
436 | client->req_contentlength_pos += r; |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
437 | client->transfer_buffer_pos = startpos; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
438 | client->transfer_buffer_len = rbody_buf_offset + r; |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
439 | if(client_send_buf(client)) { |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
440 | return 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
441 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
442 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
443 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
444 | // chunked transfer encoding: terminate |
|
681
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
445 | if(client->req_content_length == -1 && !client->request_body_terminated) { |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
446 | memcpy(client->transfer_buffer, "0\r\n\r\n", 5); |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
447 | client->transfer_buffer_pos = 0; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
448 | client->transfer_buffer_len = 5; |
|
681
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
449 | client->request_body_terminated = 1; |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
450 | if(client_send_buf(client)) { |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
451 | return 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
452 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
453 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
454 | } else if(client->req_content_length != client->req_contentlength_pos) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
455 | // incomplete request body |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
456 | client->error = 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
457 | return 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
458 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
459 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
460 | return 0; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
461 | } |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
462 | |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
463 | // returns 0 success |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
464 | // 1 would block or error |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
465 | static int client_read_response_header(HttpClient *client) { |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
466 | if(client->response_header_complete) { |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
467 | return 0; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
468 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
469 | |
|
703
395c62fac7e5
add more httpclient tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
470 | unsigned char *buffer = client->buffer.inbuf + client->buffer.cursize; |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
471 | size_t nbytes = client->buffer.maxsize - client->buffer.cursize; |
|
704
778dcf4ad63c
fix multiple reads could corrupt the httpclient buffer content
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
703
diff
changeset
|
472 | |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
473 | ssize_t r; |
|
704
778dcf4ad63c
fix multiple reads could corrupt the httpclient buffer content
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
703
diff
changeset
|
474 | while((r = read(client->socketfd, client->buffer.inbuf + client->buffer.cursize, client->buffer.maxsize - client->buffer.cursize)) > 0) { |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
475 | client->buffer.cursize += r; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
476 | if(!client->response_header_complete) { |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
477 | switch(http_parser_process(client->parser)) { |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
478 | case 0: { // finish |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
479 | if(!http_parser_validate(client->parser)) { |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
480 | client->error = 1; |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
481 | return 1; |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
482 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
483 | client->statuscode = client->parser->status; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
484 | |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
485 | client->response_header_complete = 1; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
486 | if(client->response_start) { |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
487 | cxmutstr msg = client->parser->msg; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
488 | char t = msg.ptr[msg.length]; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
489 | msg.ptr[msg.length] = 0; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
490 | int ret = client->response_start(client, client->statuscode, msg.ptr, client->response_start_userdata); |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
491 | msg.ptr[msg.length] = t; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
492 | |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
493 | if(ret != 0) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
494 | if(ret != HTTP_CLIENT_CALLBACK_WOULD_BLOCK) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
495 | client->error = 1; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
496 | } |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
497 | return 1; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
498 | } |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
499 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
500 | break; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
501 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
502 | case 1: { // need more data |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
503 | continue; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
504 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
505 | case 2: { // error |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
506 | client->error = 1; |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
507 | return 1; |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
508 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
509 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
510 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
511 | |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
512 | // header complete |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
513 | break; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
514 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
515 | |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
516 | if(r <= 0) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
517 | if(r == 0) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
518 | // unexpected EOF |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
519 | client->error = 1; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
520 | } else if(errno != EAGAIN) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
521 | log_ereport(LOG_FAILURE, "http-client: IO error: %s", strerror(errno)); |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
522 | client->error = 1; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
523 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
524 | return 1; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
525 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
526 | |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
527 | // initialize httpstream |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
528 | HeaderArray *headers = client->parser->headers; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
529 | long long contentlength = 0; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
530 | int chunkedtransferenc = 0; |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
531 | cxmutstr hdr_connection = CX_NULLSTR; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
532 | cxmutstr hdr_upgrade = CX_NULLSTR; |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
533 | while(headers) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
534 | for(int i=0;i<headers->len;i++) { |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
535 | cxmutstr header = headers->headers[i].name; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
536 | cxmutstr hvalue = headers->headers[i].value; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
537 | if(!cx_strcasecmp(header, "content-length")) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
538 | if(!cx_strtoll(hvalue, &contentlength, 10)) { |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
539 | headers = NULL; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
540 | break; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
541 | } |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
542 | } else if(!cx_strcasecmp(header, "transfer-encoding")) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
543 | if(!cx_strcmp(hvalue, "chunked")) { |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
544 | chunkedtransferenc = 1; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
545 | headers = NULL; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
546 | break; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
547 | } |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
548 | } else if(!cx_strcasecmp(header, "connection")) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
549 | hdr_connection = hvalue; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
550 | } |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
551 | |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
552 | if(client->statuscode == 101 && !cx_strcasecmp(header, "upgrade")) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
553 | hdr_upgrade = hvalue; |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
554 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
555 | } |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
556 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
557 | if(headers) { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
558 | headers = headers->next; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
559 | } |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
560 | } |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
561 | |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
562 | if(client->statuscode == 101) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
563 | if(!cx_strcasecmp(hdr_upgrade, "websocket") && !cx_strcasecmp(hdr_connection, "upgrade")) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
564 | client->stage = 2; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
565 | client->event.events = EVENT_POLLIN|EVENT_POLLOUT; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
566 | |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
567 | // prepare IO buffers for websockets |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
568 | client->transfer_buffer_len = 0; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
569 | client->transfer_buffer_pos = 0; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
570 | |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
571 | client->transfer2_buffer = malloc(HTTP_CLIENT_BUFFER_SIZE); |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
572 | if(!client->transfer2_buffer) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
573 | client->error = 1; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
574 | return 1; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
575 | } |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
576 | client->transfer2_buffer_alloc = HTTP_CLIENT_BUFFER_SIZE; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
577 | client->transfer2_buffer_len = 0; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
578 | client->transfer2_buffer_pos = 0; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
579 | } else { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
580 | // error: unknown protocol |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
581 | log_ereport(LOG_FAILURE, "http-client: unknown protocol upgrade: %.*s", (int)hdr_upgrade.length, hdr_upgrade.ptr); |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
582 | client->error = 1; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
583 | return 1; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
584 | } |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
585 | } else if(contentlength > 0 || chunkedtransferenc) { |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
586 | IOStream *fd = Sysstream_new(NULL, client->socketfd); |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
587 | if(!fd) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
588 | client->error = 1; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
589 | return 1; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
590 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
591 | HttpStream *http = (HttpStream*)httpstream_new(NULL, fd); |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
592 | if(!http) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
593 | fd->free(fd); |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
594 | } |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
595 | |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
596 | // we can reuse the already allocated transfer_bufer for transfer2 |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
597 | client->transfer2_buffer = client->transfer_buffer; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
598 | client->transfer2_buffer_alloc = client->transfer_buffer_alloc; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
599 | client->transfer2_buffer_len = 0; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
600 | client->transfer_buffer_pos = 0; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
601 | client->transfer_buffer = NULL; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
602 | client->transfer_buffer_alloc = 0; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
603 | |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
604 | if(contentlength > 0) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
605 | http->max_read = contentlength; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
606 | httpstream_enable_buffered_read(&http->st, (char*)client->buffer.inbuf, client->buffer.maxsize, &client->buffer.cursize, &client->buffer.pos); |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
607 | } else if(chunkedtransferenc) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
608 | httpstream_enable_chunked_read(&http->st, (char*)client->buffer.inbuf, client->buffer.maxsize, &client->buffer.cursize, &client->buffer.pos); |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
609 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
610 | client->stream = http; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
611 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
612 | |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
613 | return 0; |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
614 | } |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
615 | |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
616 | // uses the response_body_write callback to write the content of the |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
617 | // transfer buffer |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
618 | // returns 0 success |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
619 | // 1 would block or error |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
620 | static int client_write_response(HttpClient *client) { |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
621 | while(client->transfer2_buffer_pos < client->transfer2_buffer_len) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
622 | char *buf = client->transfer2_buffer + client->transfer2_buffer_pos; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
623 | size_t len = client->transfer2_buffer_len - client->transfer2_buffer_pos; |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
624 | int ret = client->response_body_write(client, buf, len, client->response_body_write_userdata); |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
625 | if(ret > 0) { |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
626 | client->transfer2_buffer_pos += ret; |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
627 | } else if(ret == 0) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
628 | // EOF? |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
629 | // check if the write is incomplete, which would be an error |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
630 | client->error == client->transfer2_buffer_pos < client->transfer2_buffer_len; |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
631 | return client->error; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
632 | } else { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
633 | if(ret != HTTP_CLIENT_CALLBACK_WOULD_BLOCK) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
634 | client->error = 1; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
635 | } |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
636 | return 1; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
637 | } |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
638 | } |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
639 | return 0; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
640 | } |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
641 | |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
642 | // returns 0 success |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
643 | // 1 would block or error |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
644 | static int client_read_response_body(HttpClient *client) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
645 | if(!client->stream) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
646 | return 0; // no input stream -> no response body |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
647 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
648 | |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
649 | // does the transfer buffer still contains bytes, that should be written? |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
650 | if(client_write_response(client)) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
651 | return 1; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
652 | } |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
653 | |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
654 | char *buf = client->transfer2_buffer; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
655 | size_t nbytes = client->transfer2_buffer_alloc; |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
656 | |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
657 | ssize_t r; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
658 | while((r = net_read(&client->stream->st, buf, nbytes)) > 0) { |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
659 | client->transfer2_buffer_len = r; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
660 | client->transfer2_buffer_pos = 0; |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
661 | if(client->response_body_write) { |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
662 | if(client_write_response(client)) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
663 | return 1; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
664 | } |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
665 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
666 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
667 | |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
668 | if(r < 0) { |
|
688
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
669 | if(client->stream->st.io_errno != EWOULDBLOCK) { |
|
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
670 | client->error = 1; |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
671 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
672 | return 1; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
673 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
674 | |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
675 | return 0; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
676 | } |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
677 | |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
678 | /* --------------------------------- Tests --------------------------------- */ |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
679 | |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
680 | static CX_TEST(test_http_client_send_request) { |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
681 | CX_TEST_DO { |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
682 | EventHandler dummy; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
683 | HttpClient *client = http_client_new(&dummy); |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
684 | |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
685 | int fds[2]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
686 | util_socketpair(fds); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
687 | util_socket_setnonblock(fds[0], 1); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
688 | util_socket_setnonblock(fds[1], 1); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
689 | client->socketfd = fds[0]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
690 | int sock = fds[1]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
691 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
692 | // create a large test buffer, that is bigger than the socket buffer |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
693 | // 32mb should be enough |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
694 | size_t len = 32*1024*1024; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
695 | char *str = malloc(len); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
696 | // init the buffer with random data |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
697 | for(size_t i=0;i<len;i+=sizeof(int)) { |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
698 | int *p = (int*)(str+i); |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
699 | *p = rand(); |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
700 | } |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
701 | |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
702 | client->transfer_buffer = str; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
703 | client->transfer_buffer_len = len; |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
704 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
705 | // test client_send_request |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
706 | |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
707 | int ret = client_send_buf(client); |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
708 | // It is very likely that the first client_send_request call doesn't |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
709 | // fully write the request buffer to the socket |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
710 | // In that case it returns 1 but without the error flag |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
711 | CX_TEST_ASSERT(ret == 1 && !client->error); |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
712 | CX_TEST_ASSERT(client->transfer_buffer_pos > 0); |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
713 | CX_TEST_ASSERT(client->transfer_buffer_pos < len); |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
714 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
715 | // read the request buffer from sock and continue with client_send_request |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
716 | CxBuffer buf; |
|
676
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
717 | cxBufferInit(&buf, cxDefaultAllocator, NULL, len, CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS); |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
718 | char tmpbuf[1024]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
719 | int writes = 1; |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
720 | while(client->transfer_buffer_pos < client->transfer_buffer_len && writes < 2000000) { |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
721 | ssize_t r = read(sock, tmpbuf, 1024); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
722 | CX_TEST_ASSERT(r >= 0); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
723 | cxBufferWrite(tmpbuf, 1, r, &buf); |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
724 | ret = client_send_buf(client); |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
725 | CX_TEST_ASSERT(ret == 0 || (ret == 1 && !client->error)); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
726 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
727 | writes++; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
728 | } |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
729 | CX_TEST_ASSERT(client->transfer_buffer_pos == client->transfer_buffer_len); |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
730 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
731 | // finish reading the request buffer from sock |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
732 | ssize_t r; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
733 | while((r = read(sock, tmpbuf, 1024)) > 0 && writes < 2000000) { |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
734 | cxBufferWrite(tmpbuf, 1, r, &buf); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
735 | writes++; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
736 | } |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
737 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
738 | CX_TEST_ASSERT(buf.size == len); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
739 | CX_TEST_ASSERT(!memcmp(str, buf.space, len)); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
740 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
741 | // cleanup |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
742 | close(fds[0]); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
743 | close(fds[1]); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
744 | http_client_free(client); |
|
676
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
745 | cxBufferDestroy(&buf); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
746 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
747 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
748 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
749 | typedef struct TestResponse { |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
750 | int status; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
751 | char *msg; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
752 | CxBuffer *response; |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
753 | int error_interval; |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
754 | int error_test; |
|
676
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
755 | } TestResponse; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
756 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
757 | static int test_response_start(HttpClient *client, int status, char *msg, void *userdata) { |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
758 | TestResponse *test = userdata; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
759 | test->status = status; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
760 | test->msg = strdup(msg); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
761 | return 0; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
762 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
763 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
764 | static ssize_t test_response_body_write(HttpClient *client, void *buf, size_t size, void *userdata) { |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
765 | TestResponse *test = userdata; |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
766 | if(test->error_interval > 0 && test->error_test >= test->error_interval) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
767 | test->error_test = 0; |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
768 | return HTTP_CLIENT_CALLBACK_WOULD_BLOCK; |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
769 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
770 | test->error_test++; |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
771 | |
|
676
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
772 | cxBufferWrite(buf, 1, size, test->response); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
773 | return size; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
774 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
775 | |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
776 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
777 | typedef struct TestRequestBody { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
778 | char *content; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
779 | size_t length; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
780 | size_t pos; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
781 | int chunksize; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
782 | int max_reads; // max number of reads until test_request_body_read returns 0 |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
783 | int cur_reads; // current number of read-attempts |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
784 | } TestRequestBody; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
785 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
786 | static ssize_t test_request_body_read(HttpClient *client, void *buf, size_t size, void *userdata) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
787 | TestRequestBody *req = userdata; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
788 | req->cur_reads++; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
789 | if(req->chunksize == 0 || req->cur_reads > req->max_reads) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
790 | return -1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
791 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
792 | size_t max = req->length - req->pos; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
793 | if(max == 0) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
794 | return 0; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
795 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
796 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
797 | size_t sz = req->chunksize > size ? size : req->chunksize; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
798 | if(sz > max) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
799 | sz = max; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
800 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
801 | memcpy(buf, req->content + req->pos, sz); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
802 | req->pos += sz; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
803 | return sz; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
804 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
805 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
806 | static CX_TEST(test_http_client_send_request_body_chunked) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
807 | CX_TEST_DO { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
808 | EventHandler dummy; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
809 | HttpClient *client = http_client_new(&dummy); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
810 | create_req_buffer(client); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
811 | client->req_content_length = -1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
812 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
813 | int fds[2]; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
814 | util_socketpair(fds); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
815 | util_socket_setnonblock(fds[0], 1); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
816 | util_socket_setnonblock(fds[1], 1); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
817 | client->socketfd = fds[0]; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
818 | int sock = fds[1]; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
819 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
820 | // response buffer |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
821 | CxBuffer buf; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
822 | cxBufferInit(&buf, cxDefaultAllocator, NULL, 1024, CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
823 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
824 | // test |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
825 | char request_body[1024]; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
826 | memset(request_body, 'x', 1024); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
827 | memset(request_body+128, 'y', 128); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
828 | memset(request_body+384, 'z', 128); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
829 | memset(request_body+640, ':', 128); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
830 | memset(request_body+896, '!', 128); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
831 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
832 | TestRequestBody req; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
833 | req.content = request_body; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
834 | req.length = 1024; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
835 | req.pos = 0; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
836 | req.chunksize = 16; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
837 | req.max_reads = 8; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
838 | req.cur_reads = 0; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
839 | client->request_body_read = test_request_body_read; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
840 | client->request_body_read_userdata = &req; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
841 | |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
842 | memset(client->transfer_buffer, '_', client->transfer_buffer_alloc); |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
843 | client->transfer_buffer_pos = 0; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
844 | client->transfer_buffer_len = 0; |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
845 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
846 | // send the first 128 bytes |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
847 | while(req.cur_reads <= req.max_reads) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
848 | int ret = client_send_request_body(client); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
849 | CX_TEST_ASSERT(ret == 1); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
850 | CX_TEST_ASSERT(!client->error); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
851 | char buf2[1024]; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
852 | ssize_t r = read(sock, buf2, 1024); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
853 | if(r > 0) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
854 | cxBufferWrite(buf2, 1, r, &buf); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
855 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
856 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
857 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
858 | // because we are using chunked transfer encoding, the result buffer |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
859 | // (buf) should contain more than 128 bytes (additional chunk headers) |
|
681
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
860 | CX_TEST_ASSERT(buf.pos > 128); |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
861 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
862 | // change chunk size to 128 |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
863 | req.max_reads = 9999; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
864 | req.chunksize = 128; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
865 | while(req.cur_reads <= req.max_reads) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
866 | int ret = client_send_request_body(client); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
867 | CX_TEST_ASSERT(!client->error); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
868 | char buf2[2048]; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
869 | ssize_t r; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
870 | while((r = read(sock, buf2, 2048)) > 0) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
871 | cxBufferWrite(buf2, 1, r, &buf); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
872 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
873 | if(ret == 0) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
874 | break; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
875 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
876 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
877 | CX_TEST_ASSERT(req.cur_reads < req.max_reads); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
878 | |
|
682
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
879 | // verify chunks |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
880 | char test_request_body[1024]; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
881 | memset(test_request_body, 0, 1024); |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
882 | |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
883 | int pos = 0; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
884 | int chunklen = 0; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
885 | char *str = buf.space; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
886 | while(str < buf.space + buf.size) { |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
887 | cxstring chunkheader = cx_strn(str, 2); |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
888 | if(!cx_strcmp(chunkheader, "0\r")) { |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
889 | chunkheader.length = 1; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
890 | } |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
891 | int ret = cx_strtoi(chunkheader, &chunklen, 16); |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
892 | CX_TEST_ASSERT(ret == 0); |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
893 | if(chunklen == 0) { |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
894 | break; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
895 | } |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
896 | |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
897 | char *data = str + 4; |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
898 | CX_TEST_ASSERT(data + chunklen < buf.space + buf.size); |
|
682
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
899 | memcpy(test_request_body + pos, data, chunklen); |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
900 | pos += chunklen; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
901 | str = data + chunklen; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
902 | } |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
903 | CX_TEST_ASSERT(!memcmp(request_body, test_request_body, 1024)); |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
904 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
905 | // cleanup |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
906 | close(fds[0]); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
907 | close(fds[1]); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
908 | http_client_free(client); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
909 | cxBufferDestroy(&buf); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
910 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
911 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
912 | |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
913 | static CX_TEST_SUBROUTINE(test_read_response, cxstring response_str, CxBuffer *response_body) { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
914 | EventHandler dummy; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
915 | HttpClient *client = http_client_new(&dummy); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
916 | create_req_buffer(client); |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
917 | client->transfer_buffer_pos = 0; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
918 | client->transfer_buffer_len = 0; |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
919 | client->req_content_length = -1; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
920 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
921 | int fds[2]; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
922 | util_socketpair(fds); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
923 | util_socket_setnonblock(fds[0], 1); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
924 | util_socket_setnonblock(fds[1], 1); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
925 | client->socketfd = fds[0]; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
926 | int sock = fds[1]; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
927 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
928 | TestResponse testr = { 0 }; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
929 | testr.response = response_body; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
930 | client->response_body_write = test_response_body_write; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
931 | client->response_body_write_userdata = &testr; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
932 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
933 | // test |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
934 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
935 | size_t response_pos = 0; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
936 | while(response_pos < response_str.length) { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
937 | size_t nbytes = response_str.length - response_pos; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
938 | ssize_t w = write(sock, response_str.ptr + response_pos, nbytes); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
939 | if(w > 0) { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
940 | response_pos += w; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
941 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
942 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
943 | if(!client->response_header_complete) { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
944 | int ret = client_read_response_header(client); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
945 | CX_TEST_ASSERT(client->error == 0); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
946 | if(ret == 1) { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
947 | continue; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
948 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
949 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
950 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
951 | if(response_body != NULL) { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
952 | CX_TEST_ASSERT(client->stream != NULL); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
953 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
954 | int ret = client_read_response_body(client); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
955 | CX_TEST_ASSERT(client->error == 0); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
956 | if(ret == 1) { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
957 | continue; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
958 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
959 | } else { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
960 | CX_TEST_ASSERT(client->stream == NULL); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
961 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
962 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
963 | break; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
964 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
965 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
966 | // cleanup |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
967 | close(fds[0]); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
968 | close(fds[1]); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
969 | http_client_free(client); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
970 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
971 | |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
972 | static CX_TEST(test_http_client_read_response_head) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
973 | CX_TEST_DO { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
974 | char *response_str = |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
975 | "HTTP/1.1 204 OK\r\n" |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
976 | "Host: localhost\r\n" |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
977 | "Content-length: 0\r\n" |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
978 | "\r\n"; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
979 | |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
980 | CX_TEST_CALL_SUBROUTINE(test_read_response, cx_str(response_str), NULL); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
981 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
982 | response_str = |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
983 | "HTTP/1.1 204 OK\r\n" |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
984 | "Host: localhost\r\n" |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
985 | "\r\n"; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
986 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
987 | CX_TEST_CALL_SUBROUTINE(test_read_response, cx_str(response_str), NULL); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
988 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
989 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
990 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
991 | static CX_TEST(test_http_client_read_response_ctlen) { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
992 | CX_TEST_DO { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
993 | char *response_str = |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
994 | "HTTP/1.1 200 OK\r\n" |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
995 | "Host: localhost\r\n" |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
996 | "Content-length: 13\r\n" |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
997 | "\r\n" |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
998 | "Hello World!\n"; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
999 | CxBuffer *buf = cxBufferCreate(NULL, NULL, 1024, CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1000 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1001 | CX_TEST_CALL_SUBROUTINE(test_read_response, cx_str(response_str), buf); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1002 | CX_TEST_ASSERT(buf->size == 13); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1003 | CX_TEST_ASSERT(!cx_strcmp(cx_strn(buf->space, buf->size), "Hello World!\n")); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1004 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1005 | cxBufferFree(buf); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1006 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1007 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1008 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1009 | static CX_TEST(test_http_client_read_response_ctlen_big) { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1010 | CX_TEST_DO { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1011 | // create response body |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1012 | size_t len = 1024*1024*32; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1013 | char *response_str = malloc(len); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1014 | char *str = response_str; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1015 | for(size_t i=0;i<len;i+=sizeof(int)) { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1016 | int *p = (int*)(str+i); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1017 | *p = rand(); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1018 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1019 | cxstring body = cx_strn(response_str, len); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1020 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1021 | // create request string |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1022 | CxBuffer *req = cxBufferCreate(NULL, NULL, 1024, CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1023 | cxBufferPutString(req, |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1024 | "HTTP/1.1 200 OK\r\n" |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1025 | "Host: localhost\r\n" |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1026 | "Content-length: "); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1027 | char ctlen[32]; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1028 | snprintf(ctlen, 32, "%d\r\n\r\n", (int)len); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1029 | cxBufferPutString(req, ctlen); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1030 | cxBufferPutString(req, body); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1031 | cxBufferTerminate(req); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1032 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1033 | // response buffer |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1034 | CxBuffer *buf = cxBufferCreate(NULL, NULL, 1024, CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1035 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1036 | // test |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1037 | CX_TEST_CALL_SUBROUTINE(test_read_response, cx_strn(req->space, req->size), buf); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1038 | CX_TEST_ASSERT(buf->size == len); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1039 | CX_TEST_ASSERT(!cx_strcmp(cx_strn(buf->space, buf->size), body)); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1040 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1041 | cxBufferFree(req); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1042 | cxBufferFree(buf); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1043 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1044 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1045 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1046 | static CX_TEST_SUBROUTINE(test_http_client_io, cxstring response, int status_code, const char *msg, CxBuffer *out_buf, size_t write_blocksz, int error_interval) { |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1047 | EventHandler dummy; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1048 | HttpClient *client = http_client_new(&dummy); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1049 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1050 | int fds[2]; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1051 | util_socketpair(fds); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1052 | util_socket_setnonblock(fds[0], 1); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1053 | util_socket_setnonblock(fds[1], 1); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1054 | client->socketfd = fds[0]; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1055 | int sock = fds[1]; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1056 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1057 | // setup client |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1058 | http_client_set_uri(client, "/test/uri/"); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1059 | http_client_set_method(client, "GET"); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1060 | http_client_add_request_header(client, cx_mutstr("Host"), cx_mutstr("localhost")); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1061 | http_client_add_request_header(client, cx_mutstr("Test1"), cx_mutstr("value1")); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1062 | http_client_add_request_header(client, cx_mutstr("Test2"), cx_mutstr("value2")); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1063 | create_req_buffer(client); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1064 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1065 | size_t req_header_len = client->transfer_buffer_len; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1066 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1067 | TestResponse testr = { 0 }; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1068 | testr.response = out_buf; |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1069 | testr.error_interval = error_interval; |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1070 | client->response_start = test_response_start; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1071 | client->response_start_userdata = &testr; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1072 | client->response_body_write = test_response_body_write; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1073 | client->response_body_write_userdata = &testr; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1074 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1075 | // test IO |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1076 | Event event; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1077 | event.cookie = client; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1078 | int ret = client_io(&dummy, &event); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1079 | CX_TEST_ASSERT(!client->error); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1080 | CX_TEST_ASSERT(ret == 1); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1081 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1082 | // do IO and read request until the header is processed |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1083 | size_t req_header_pos = 0; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1084 | char req_buf[4]; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1085 | while(req_header_pos < req_header_len) { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1086 | ssize_t r = read(sock, req_buf, 4); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1087 | if(r == 0) { |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
1088 | break; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
1089 | } |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1090 | CX_TEST_ASSERT(r > 0); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1091 | req_header_pos += r; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1092 | ret = client_io(&dummy, &event); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1093 | CX_TEST_ASSERT(!client->error); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1094 | CX_TEST_ASSERT(ret == 1); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1095 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1096 | CX_TEST_ASSERT(req_header_pos == req_header_len); |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1097 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1098 | const char *response_str = response.ptr; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1099 | size_t response_str_len = response.length; |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1100 | size_t response_str_pos = 0; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1101 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1102 | // send response and do IO |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1103 | int in_progress = 1; |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1104 | while(in_progress) { |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1105 | size_t len = response_str_len - response_str_pos; |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1106 | if(len > 0) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1107 | if(len > write_blocksz) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1108 | len = write_blocksz; |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1109 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1110 | ssize_t w = write(sock, response_str + response_str_pos, len); |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1111 | if(w == 0) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1112 | break; |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1113 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1114 | CX_TEST_ASSERT(w > 0); |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1115 | response_str_pos += w; |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1116 | } |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1117 | |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1118 | ret = client_io(&dummy, &event); |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1119 | if(ret == 0) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1120 | in_progress = 0; |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1121 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1122 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1123 | CX_TEST_ASSERT(!client->error); |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
1124 | } |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1125 | CX_TEST_ASSERT(response_str_pos == response_str_len); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1126 | CX_TEST_ASSERT(testr.status == status_code); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1127 | CX_TEST_ASSERT(testr.msg); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1128 | CX_TEST_ASSERT(!strcmp(testr.msg, msg)); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1129 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1130 | // cleanup |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1131 | free(testr.msg); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1132 | close(fds[0]); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1133 | close(fds[1]); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1134 | http_client_free(client); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1135 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1136 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1137 | static CX_TEST_SUBROUTINE(test_http_client_io_simple, size_t blocksz, int error_interval) { |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1138 | cxstring response_str = cx_str( |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1139 | "HTTP/1.1 200 OK\r\n" |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1140 | "Host: localhost\r\n" |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1141 | "Content-length: 13\r\n" |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1142 | "\r\n" |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1143 | "Hello World!\n"); |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1144 | CxBuffer *buf = cxBufferCreate(NULL, NULL, 1024, CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1145 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1146 | CX_TEST_CALL_SUBROUTINE(test_http_client_io, response_str, 200, "OK", buf, blocksz, error_interval); |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1147 | CX_TEST_ASSERT(buf->size == 13); |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1148 | CX_TEST_ASSERT(!cx_strcmp(cx_strn(buf->space, buf->size), "Hello World!\n")); |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1149 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1150 | cxBufferFree(buf); |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
1151 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
1152 | |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1153 | static CX_TEST(test_http_client_io_simple_1b) { |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1154 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1155 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 1, 0); |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1156 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1157 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1158 | |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1159 | static CX_TEST(test_http_client_io_simple_2b) { |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1160 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1161 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 2, 0); |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1162 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1163 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1164 | |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1165 | static CX_TEST(test_http_client_io_simple_3b) { |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1166 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1167 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 3, 0); |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1168 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1169 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1170 | |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1171 | static CX_TEST(test_http_client_io_simple_16b) { |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1172 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1173 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 16, 0); |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1174 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1175 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1176 | |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1177 | static CX_TEST(test_http_client_io_simple_512b) { |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1178 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1179 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 512, 0); |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1180 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1181 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1182 | |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1183 | static CX_TEST_SUBROUTINE(test_http_client_io_large, size_t blocksz) { |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1184 | int ctlen = 1024*1024*32; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1185 | CxBuffer *resp = cxBufferCreate(NULL, NULL, ctlen + 128, CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1186 | cx_bprintf(resp, |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1187 | "HTTP/1.1 200 OK\r\n" |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1188 | "Host: localhost\r\n" |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1189 | "Content-length: %d\r\n" |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1190 | "\r\n", |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1191 | ctlen); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1192 | size_t content_start = resp->pos; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1193 | CX_TEST_ASSERT(resp->pos + ctlen < resp->capacity); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1194 | memset(resp->space + resp->pos, 'x', ctlen); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1195 | resp->pos += ctlen; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1196 | resp->size += ctlen; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1197 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1198 | CxBuffer *buf = cxBufferCreate(NULL, NULL, 1024, CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1199 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1200 | CX_TEST_CALL_SUBROUTINE(test_http_client_io, cx_strn(resp->space, resp->size), 200, "OK", buf, blocksz, 0); |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1201 | CX_TEST_ASSERT(buf->size == ctlen); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1202 | CX_TEST_ASSERT(!memcmp(buf->space, resp->space + content_start, ctlen)); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1203 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1204 | cxBufferFree(resp); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1205 | cxBufferFree(buf); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1206 | } |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1207 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1208 | static CX_TEST(test_http_client_io_large_128b) { |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1209 | CX_TEST_DO { |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1210 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_large, 128); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1211 | } |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1212 | } |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1213 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1214 | static CX_TEST(test_http_client_io_large_4096b) { |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1215 | CX_TEST_DO { |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1216 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_large, 1024); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1217 | } |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1218 | } |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1219 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1220 | static CX_TEST_SUBROUTINE(test_http_client_io_chunked_transfer, size_t blocksz, int error_interval) { |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1221 | cxstring response_str = cx_str( |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1222 | "HTTP/1.1 200 OK\r\n" |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1223 | "Host: localhost\r\n" |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1224 | "Transfer-encoding: chunked\r\n" |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1225 | "\r\n" |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1226 | "d\r\n" |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1227 | "Hello World!\n" |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1228 | "\r\n" |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1229 | "0\r\n\r\n"); |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1230 | CxBuffer *buf = cxBufferCreate(NULL, NULL, 1024, CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS); |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1231 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1232 | CX_TEST_CALL_SUBROUTINE(test_http_client_io, response_str, 200, "OK", buf, blocksz, error_interval); |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1233 | CX_TEST_ASSERT(buf->size == 13); |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1234 | CX_TEST_ASSERT(!cx_strcmp(cx_strn(buf->space, buf->size), "Hello World!\n")); |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1235 | |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1236 | cxBufferFree(buf); |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1237 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1238 | |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1239 | static CX_TEST(test_http_client_io_chunked_transfer_1b) { |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1240 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1241 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_chunked_transfer, 1, 0); |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1242 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1243 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1244 | |
|
688
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
1245 | static CX_TEST(test_http_client_io_chunked_transfer_2b) { |
|
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
1246 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1247 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_chunked_transfer, 2, 0); |
|
688
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
1248 | } |
|
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
1249 | } |
|
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
1250 | |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1251 | static CX_TEST(test_http_client_io_chunked_transfer_8b) { |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1252 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1253 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_chunked_transfer, 16, 0); |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1254 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1255 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1256 | |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1257 | static CX_TEST(test_http_client_io_chunked_transfer_64b) { |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1258 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1259 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_chunked_transfer, 64, 0); |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1260 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1261 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1262 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1263 | static CX_TEST_SUBROUTINE(test_http_client_io_large_chunked_transfer, size_t blocksz, int error_interval) { |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1264 | int chunk1 = 1024*1024*2; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1265 | int chunk2 = 1024*128; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1266 | int chunk3 = 123; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1267 | int chunk4 = 1024*1024*5; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1268 | int chunk5 = 1024*16; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1269 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1270 | char *chunkbuf = malloc(chunk4); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1271 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1272 | int ctlen = chunk1 + chunk2 + chunk3 + chunk4 + chunk5; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1273 | CxBuffer *resp = cxBufferCreate(NULL, NULL, ctlen * 128, CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1274 | cx_bprintf(resp, |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1275 | "HTTP/1.1 200 OK\r\n" |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1276 | "Transfer-encoding: chunked\r\n" |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1277 | "\r\n", |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1278 | ctlen); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1279 | size_t content_start = resp->pos; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1280 | CX_TEST_ASSERT(resp->pos + ctlen < resp->capacity); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1281 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1282 | memset(chunkbuf, 'x', chunk1); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1283 | cx_bprintf(resp, "%x\r\n", chunk1); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1284 | int chunk1_pos = resp->pos; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1285 | cxBufferWrite(chunkbuf, 1, chunk1, resp); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1286 | cxBufferPutString(resp, "\r\n"); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1287 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1288 | memset(chunkbuf, '2', chunk2); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1289 | cx_bprintf(resp, "%x\r\n", chunk2); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1290 | int chunk2_pos = resp->pos; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1291 | cxBufferWrite(chunkbuf, 1, chunk2, resp); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1292 | cxBufferPutString(resp, "\r\n"); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1293 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1294 | memset(chunkbuf, 'c', chunk3); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1295 | cx_bprintf(resp, "%x\r\n", chunk3); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1296 | int chunk3_pos = resp->pos; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1297 | cxBufferWrite(chunkbuf, 1, chunk3, resp); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1298 | cxBufferPutString(resp, "\r\n"); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1299 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1300 | memset(chunkbuf, '4', chunk4); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1301 | cx_bprintf(resp, "%x\r\n", chunk4); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1302 | int chunk4_pos = resp->pos; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1303 | cxBufferWrite(chunkbuf, 1, chunk4, resp); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1304 | cxBufferPutString(resp, "\r\n"); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1305 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1306 | memset(chunkbuf, 'z', chunk5); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1307 | cx_bprintf(resp, "%x\r\n", chunk5); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1308 | int chunk5_pos = resp->pos; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1309 | cxBufferWrite(chunkbuf, 1, chunk5, resp); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1310 | cxBufferPutString(resp, "\r\n0\r\n\r\n"); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1311 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1312 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1313 | CxBuffer *buf = cxBufferCreate(NULL, NULL, 1024, CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1314 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1315 | CX_TEST_CALL_SUBROUTINE(test_http_client_io, cx_strn(resp->space, resp->size), 200, "OK", buf, blocksz, error_interval); |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1316 | CX_TEST_ASSERT(buf->size == ctlen); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1317 | CX_TEST_ASSERT(!memcmp(buf->space, resp->space + chunk1_pos, chunk1)); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1318 | CX_TEST_ASSERT(!memcmp(buf->space + chunk1, resp->space + chunk2_pos, chunk2)); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1319 | CX_TEST_ASSERT(!memcmp(buf->space + chunk1 + chunk2, resp->space + chunk3_pos, chunk3)); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1320 | CX_TEST_ASSERT(!memcmp(buf->space + chunk1 + chunk2 + chunk3, resp->space + chunk4_pos, chunk4)); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1321 | CX_TEST_ASSERT(!memcmp(buf->space + chunk1 + chunk2 + chunk3 + chunk4, resp->space + chunk5_pos, chunk5)); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1322 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1323 | cxBufferFree(resp); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1324 | cxBufferFree(buf); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1325 | } |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1326 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1327 | static CX_TEST(test_http_client_io_large_chunked_transfer_1024b) { |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1328 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1329 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_large_chunked_transfer, 1024, 0); |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1330 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1331 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1332 | |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1333 | static CX_TEST(test_http_client_io_write_error1) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1334 | CX_TEST_DO { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1335 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 1, 1); |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1336 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1337 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1338 | |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1339 | static CX_TEST(test_http_client_io_write_error2) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1340 | CX_TEST_DO { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1341 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 1, 2); |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1342 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1343 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1344 | |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1345 | static CX_TEST(test_http_client_io_write_error3) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1346 | CX_TEST_DO { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1347 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 1, 3); |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1348 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1349 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1350 | |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1351 | static CX_TEST(test_http_client_io_write_blsz8_error1) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1352 | CX_TEST_DO { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1353 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 8, 1); |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1354 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1355 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1356 | |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1357 | static CX_TEST(test_http_client_io_write_blsz8_error2) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1358 | CX_TEST_DO { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1359 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 8, 2); |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1360 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1361 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1362 | |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1363 | static CX_TEST(test_http_client_io_write_blsz8_error3) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1364 | CX_TEST_DO { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1365 | CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 8, 3); |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1366 | } |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1367 | } |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1368 | |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
1369 | void http_client_add_tests(CxTestSuite *suite) { |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
1370 | cx_test_register(suite, test_http_client_send_request); |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
1371 | cx_test_register(suite, test_http_client_send_request_body_chunked); |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
1372 | cx_test_register(suite, test_http_client_read_response_head); |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1373 | cx_test_register(suite, test_http_client_read_response_ctlen); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1374 | cx_test_register(suite, test_http_client_read_response_ctlen_big); |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1375 | cx_test_register(suite, test_http_client_io_simple_1b); |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1376 | cx_test_register(suite, test_http_client_io_simple_2b); |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1377 | cx_test_register(suite, test_http_client_io_simple_3b); |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1378 | cx_test_register(suite, test_http_client_io_simple_16b); |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1379 | cx_test_register(suite, test_http_client_io_simple_512b); |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1380 | cx_test_register(suite, test_http_client_io_large_128b); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1381 | cx_test_register(suite, test_http_client_io_large_4096b); |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1382 | cx_test_register(suite, test_http_client_io_chunked_transfer_1b); |
|
688
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
1383 | cx_test_register(suite, test_http_client_io_chunked_transfer_2b); |
|
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
1384 | cx_test_register(suite, test_http_client_io_chunked_transfer_8b); |
|
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
1385 | cx_test_register(suite, test_http_client_io_chunked_transfer_64b); |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1386 | cx_test_register(suite, test_http_client_io_large_chunked_transfer_1024b); |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1387 | cx_test_register(suite, test_http_client_io_write_error1); |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1388 | cx_test_register(suite, test_http_client_io_write_error2); |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1389 | cx_test_register(suite, test_http_client_io_write_error3); |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1390 | cx_test_register(suite, test_http_client_io_write_blsz8_error1); |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1391 | cx_test_register(suite, test_http_client_io_write_blsz8_error2); |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1392 | cx_test_register(suite, test_http_client_io_write_blsz8_error3); |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
1393 | } |