src/server/proxy/httpclient.c

Sat, 21 Feb 2026 14:40:03 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sat, 21 Feb 2026 14:40:03 +0100
changeset 692
32faa1d6a744
parent 691
4d8a55a7618b
permissions
-rw-r--r--

add httpclient response write error tests

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
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
44 static int client_send_request(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);
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
92 free(client->addr);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
93 free(client->method);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
94 free(client->uri);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
95 free(client);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
96 }
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
97
665
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
98 int http_client_set_addr(HttpClient *client, const struct sockaddr *addr, socklen_t addrlen) {
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
99 free(client->addr);
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
100 client->addr = NULL;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
101 client->addrlen = 0;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
102
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
103 void *newaddr = malloc(addrlen);
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
104 if(!newaddr) {
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
105 return 1;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
106 }
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
107 memcpy(newaddr, addr, addrlen);
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
108 client->addr = newaddr;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
109 client->addrlen = addrlen;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
110
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
111 return 0;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
112 }
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
113
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
114 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
115 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
116 }
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
117
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
118 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
119 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
120 }
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
121
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
122 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
123 free(*ptr);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
124 if(str) {
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
125 char *newvalue = malloc(len+1);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
126 if(!newvalue) {
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
127 *ptr = NULL;
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
128 return 1;
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 memcpy(newvalue, str, len);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
131 newvalue[len] = 0;
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
132 *ptr = newvalue;
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
133 } else {
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
134 *ptr = NULL;
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
135 }
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
136 return 0;
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
137 }
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
138
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
139 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
140 return client_set_str(&client->method, method, len);
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
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
143 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
144 return client_set_str(&client->uri, uri, len);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
145 }
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
146
665
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
147 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
148 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
149 }
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
150
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
151 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
152 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
153 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
154 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
155 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
156 }
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
157 }
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
158
665
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
159 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
160 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
161
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
162 int err = 1;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
163 if(n.ptr && v.ptr) {
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
164 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
165 }
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
166 if(err) {
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
167 cxFree(client->mp->allocator, n.ptr);
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
168 cxFree(client->mp->allocator, v.ptr);
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
169 }
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
170 return err;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
171 }
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
172
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
173 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
174 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
175 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
176 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
177 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
178 }
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
179
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
180 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
181 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
182 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
183 }
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
184
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
185 int http_client_start(HttpClient *client) {
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
186 int socketfd = socket(AF_INET, SOCK_STREAM, 0);
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
187 if(socketfd < 0) {
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
188 return 1;
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
189 }
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
190
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
191 if(util_socket_setnonblock(socketfd, 1)) {
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
192 close(socketfd);
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
193 return 1;
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
194 }
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
195
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
196 client->socketfd = socketfd;
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
197
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
198 client->writeev.cookie = client;
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
199 client->writeev.fn = client_connected;
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
200
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
201 int ret = 1;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
202 if(connect(socketfd, client->addr, client->addrlen)) {
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
203 int err = errno;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
204 if(err == EINPROGRESS) {
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
205 ret = ev_pollout(client->ev, socketfd, &client->writeev);
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
206 } else {
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
207 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
208 }
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
209 } else {
691
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
210 ret = 0; // TODO
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
211 }
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
212
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
213 if(ret) {
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
214 close(socketfd);
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
215 }
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
216 return ret;
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
217 }
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
218
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
219 static int create_req_buffer(HttpClient *client) {
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
220 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
221 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
222 return 1;
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
223 }
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
224
668
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
225 if(client->method) {
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
226 cxBufferPutString(&buf, "GET ");
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
227 } else {
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
228 cxBufferPutString(&buf, client->method);
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
229 }
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
230 cxBufferPutString(&buf, client->uri ? client->uri : "/");
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
231 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
232
668
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
233 HeaderArray *hdr = client->request_headers;
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
234 while(hdr) {
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
235 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
236 cxBufferPutString(&buf, hdr->headers[i].name);
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
237 cxBufferPutString(&buf, ": ");
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
238 cxBufferPutString(&buf, hdr->headers[i].value);
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
239 cxBufferPutString(&buf, "\r\n");
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
240 }
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
241 hdr = hdr->next;
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
242 }
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
243 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
244 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
245 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
246 client->transfer_buffer_len = buf.size;
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
247
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
248 return 0;
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
249 }
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
250
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
251 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
252 HttpClient *client = event->cookie;
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
253 if(create_req_buffer(client)) {
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
254 // TODO: set error
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
255 return 0; // end
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
256 }
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
257 event->fn = client_io;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
258
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
259 return client_io(ev, event);
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
260 }
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
261
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
262 static int client_io(EventHandler *ev, Event *event) {
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
263 HttpClient *client = event->cookie;
691
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
264 if(client->stage == 0) {
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
265 if(client->transfer_buffer_pos < client->transfer_buffer_len) {
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
266 if(client_send_request(client)) {
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
267 return client->error == 0;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
268 }
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
269 }
691
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
270
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
271 // do we need to send a request body?
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
272 if(client->req_content_length != 0) {
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
273 if(client_send_request_body(client)) {
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
274 return client->error == 0;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
275 }
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
276 }
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
277
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
278 client->transfer_buffer_pos = 0;
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
279 client->transfer_buffer_len = 0;
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
280 }
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
281
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
282 // writing complete, switch to read events
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
283 event->events = EVENT_POLLIN;
691
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
284 client->stage = 1;
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
285
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
286 if(client_read_response_header(client)) {
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
287 return client->error == 0;
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
288 }
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
289 if(client_read_response_body(client)) {
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
290 return client->error == 0;
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
291 }
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
292
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
293 return 0;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
294 }
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
295
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
296 static int client_finished(EventHandler *ev, Event *event) {
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
297 HttpClient *client = event->cookie;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
298
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
299 close(client->socketfd);
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
300 client->socketfd = -1;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
301
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
302 // request finished
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
303 if(client->response_finished) {
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
304 client->response_finished(client, client->response_finished_userdata);
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
305 }
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
306
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
307 return 0;
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
308 }
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
309
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
310 static int client_send_request(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
311 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
312 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
313 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
314 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
315 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
316 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
317 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
318 }
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 }
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
320
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
321 if(w <= 0) {
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
322 if(errno != EAGAIN) {
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
323 // TODO: log correct host
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
324 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
325 client->error = 1;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
326 }
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
327 return 1;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
328 }
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
329
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
330 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
331 }
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
332
680
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
333 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
334 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
335 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
336 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
337 // chunked transfer encoding:
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
338 // 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
339 // 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
340 rbody_readsize -= 16;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
341 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
342 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
343 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
344 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
345 if(r <= 0) {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
346 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
347 return 1;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
348 } 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
349 // EOF
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
350 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
351 break;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
352 } else {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
353 // error
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
354 client->error = 1;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
355 return 1;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
356 }
681
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
357 } 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
358 // 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
359 // 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
360 // 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
361 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
362 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
363 if(r > 0) {
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
364 r += r2;
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
365 } 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
366 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
367 r += 5;
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
368 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
369 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
370 } 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
371 return 1;
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
372 } else {
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
373 client->error = 1;
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
374 return 1;
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
375 }
680
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
376 }
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
377
680
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
378 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
379 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
380 char chunkheader[16];
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
381 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
382 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
383 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
384 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
385
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
386 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
387 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
388 client->transfer_buffer_len = rbody_buf_offset + r;
680
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
389 if(client_send_request(client)) {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
390 return 1;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
391 }
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
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
394 // 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
395 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
396 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
397 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
398 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
399 client->request_body_terminated = 1;
680
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
400 if(client_send_request(client)) {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
401 return 1;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
402 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
403
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
404 } 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
405 // incomplete request body
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
406 client->error = 1;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
407 return 1;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
408 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
409
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
410 return 0;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
411 }
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
412
691
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
413 // returns 0 success
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
414 // 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
415 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
416 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
417 return 0;
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
418 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
419
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
420 char *buffer = client->buffer.inbuf + client->buffer.pos;
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
421 size_t nbytes = client->buffer.maxsize - client->buffer.cursize;
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
422
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
423 ssize_t r;
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
424 while((r = read(client->socketfd, buffer, nbytes)) > 0) {
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
425 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
426 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
427 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
428 case 0: { // finish
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
429 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
430 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
431 return 1;
683
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
432 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
433 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
434
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
435 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
436 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
437 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
438 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
439 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
440 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
441 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
442
691
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
443 if(ret != 0) {
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
444 if(ret != HTTP_CLIENT_CALLBACK_WOULD_BLOCK) {
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
445 client->error = 1;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
446 }
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
447 return 1;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
448 }
683
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
449 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
450 break;
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
451 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
452 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
453 continue;
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
454 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
455 case 2: { // error
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
456 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
457 return 1;
683
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
458 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
459 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
460 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
461
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
462 // 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
463 break;
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
464 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
465
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
466 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
467 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
468 // 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
469 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
470 } 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
471 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
472 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
473 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
474 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
475 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
476
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
477 // 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
478 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
479 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
480 int chunkedtransferenc = 0;
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
481 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
482 for(int i=0;i<headers->len;i++) {
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
483 if(!cx_strcasecmp(headers->headers[i].name, "content-length")) {
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
484 if(!cx_strtoll(headers->headers[i].value, &contentlength, 10)) {
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
485 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
486 break;
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
487 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
488 } else if(!cx_strcasecmp(headers->headers[i].name, "transfer-encoding")) {
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
489 if(!cx_strcmp(headers->headers[i].value, "chunked")) {
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
490 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
491 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
492 break;
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
493 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
494 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
495 }
686
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
496
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
497 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
498 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
499 }
683
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
500 }
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
501
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
502 if(contentlength > 0 || chunkedtransferenc) {
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
503 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
504 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
505 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
506 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
507 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
508 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
509 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
510 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
511 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
512 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
513 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
514 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
515 } 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
516 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
517 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
518 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
519 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
520
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
521 return 0;
683
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
522 }
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
523
691
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
524 // 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
525 // transfer buffer
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
526 // returns 0 success
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
527 // 1 would block or error
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
528 static int client_write_response(HttpClient *client) {
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
529 while(client->transfer_buffer_pos < client->transfer_buffer_len) {
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
530 char *buf = client->transfer_buffer + client->transfer_buffer_pos;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
531 size_t len = client->transfer_buffer_len - client->transfer_buffer_pos;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
532 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
533 if(ret > 0) {
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
534 client->transfer_buffer_pos += ret;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
535 } else if(ret == 0) {
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
536 // EOF?
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
537 // check if the write is incomplete, which would be an error
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
538 client->error == client->transfer_buffer_pos < client->transfer_buffer_len;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
539 return client->error;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
540 } else {
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
541 if(ret != HTTP_CLIENT_CALLBACK_WOULD_BLOCK) {
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
542 client->error = 1;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
543 }
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
544 return 1;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
545 }
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
546 }
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
547 return 0;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
548 }
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
549
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
550 // returns 0 success
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
551 // 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
552 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
553 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
554 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
555 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
556
691
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
557 // 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
558 if(client_write_response(client)) {
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
559 return 1;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
560 }
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
561
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
562 char *buf = client->transfer_buffer;
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
563 size_t nbytes = 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
564
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
565 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
566 while((r = net_read(&client->stream->st, buf, nbytes)) > 0) {
691
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
567 client->transfer_buffer_len = r;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
568 client->transfer_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
569 if(client->response_body_write) {
691
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
570 if(client_write_response(client)) {
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
571 return 1;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
572 }
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
573 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
574 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
575
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
576 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
577 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
578 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
579 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
580 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
581 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
582
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
583 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
584 }
683
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
585
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
586 /* --------------------------------- Tests --------------------------------- */
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
587
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
588 static CX_TEST(test_http_client_send_request) {
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
589 CX_TEST_DO {
674
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
590 EventHandler dummy;
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
591 HttpClient *client = http_client_new(&dummy);
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
592
674
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
593 int fds[2];
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
594 util_socketpair(fds);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
595 util_socket_setnonblock(fds[0], 1);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
596 util_socket_setnonblock(fds[1], 1);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
597 client->socketfd = fds[0];
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
598 int sock = fds[1];
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
599
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
600 // 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
601 // 32mb should be enough
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
602 size_t len = 32*1024*1024;
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
603 char *str = malloc(len);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
604 // init the buffer with random data
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
605 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
606 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
607 *p = rand();
674
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
608 }
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
609
684
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->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
611 client->transfer_buffer_len = len;
674
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
612
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
613 // test client_send_request
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
614
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
615 int ret = client_send_request(client);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
616 // 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
617 // 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
618 // 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
619 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
620 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
621 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
622
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
623 // 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
624 CxBuffer buf;
676
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
625 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
626 char tmpbuf[1024];
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
627 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
628 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
629 ssize_t r = read(sock, tmpbuf, 1024);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
630 CX_TEST_ASSERT(r >= 0);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
631 cxBufferWrite(tmpbuf, 1, r, &buf);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
632 ret = client_send_request(client);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
633 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
634
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
635 writes++;
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
636 }
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
637 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
638
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
639 // finish reading the request buffer from sock
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
640 ssize_t r;
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
641 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
642 cxBufferWrite(tmpbuf, 1, r, &buf);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
643 writes++;
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
644 }
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
645
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
646 CX_TEST_ASSERT(buf.size == len);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
647 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
648
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
649 // cleanup
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
650 close(fds[0]);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
651 close(fds[1]);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
652 http_client_free(client);
676
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
653 cxBufferDestroy(&buf);
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
654 }
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
655 }
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
656
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
657 typedef struct TestResponse {
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
658 int status;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
659 char *msg;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
660 CxBuffer *response;
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
661 int error_interval;
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
662 int error_test;
676
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
663 } TestResponse;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
664
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
665 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
666 TestResponse *test = userdata;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
667 test->status = status;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
668 test->msg = strdup(msg);
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
669 return 0;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
670 }
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
671
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
672 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
673 TestResponse *test = userdata;
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
674 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
675 test->error_test = 0;
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
676 return HTTP_CLIENT_CALLBACK_WOULD_BLOCK;
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
677 }
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
678 test->error_test++;
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
679
676
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
680 cxBufferWrite(buf, 1, size, test->response);
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
681 return size;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
682 }
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
683
680
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
684
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
685 typedef struct TestRequestBody {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
686 char *content;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
687 size_t length;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
688 size_t pos;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
689 int chunksize;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
690 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
691 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
692 } TestRequestBody;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
693
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
694 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
695 TestRequestBody *req = userdata;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
696 req->cur_reads++;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
697 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
698 return -1;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
699 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
700 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
701 if(max == 0) {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
702 return 0;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
703 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
704
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
705 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
706 if(sz > max) {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
707 sz = max;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
708 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
709 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
710 req->pos += sz;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
711 return sz;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
712 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
713
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
714 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
715 CX_TEST_DO {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
716 EventHandler dummy;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
717 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
718 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
719 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
720
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
721 int fds[2];
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
722 util_socketpair(fds);
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
723 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
724 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
725 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
726 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
727
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
728 // response buffer
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
729 CxBuffer buf;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
730 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
731
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
732 // test
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
733 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
734 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
735 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
736 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
737 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
738 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
739
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
740 TestRequestBody req;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
741 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
742 req.length = 1024;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
743 req.pos = 0;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
744 req.chunksize = 16;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
745 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
746 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
747 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
748 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
749
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
750 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
751 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
752 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
753
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
754 // 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
755 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
756 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
757 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
758 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
759 char buf2[1024];
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
760 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
761 if(r > 0) {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
762 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
763 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
764 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
765
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
766 // 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
767 // (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
768 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
769
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
770 // 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
771 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
772 req.chunksize = 128;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
773 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
774 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
775 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
776 char buf2[2048];
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
777 ssize_t r;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
778 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
779 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
780 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
781 if(ret == 0) {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
782 break;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
783 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
784 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
785 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
786
682
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
787 // verify chunks
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
788 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
789 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
790
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
791 int pos = 0;
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
792 int chunklen = 0;
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
793 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
794 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
795 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
796 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
797 chunkheader.length = 1;
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
798 }
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
799 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
800 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
801 if(chunklen == 0) {
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
802 break;
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
803 }
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
804
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
805 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
806 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
807 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
808 pos += chunklen;
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
809 str = data + chunklen;
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
810 }
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
811 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
812
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
813 // cleanup
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
814 close(fds[0]);
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
815 close(fds[1]);
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
816 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
817 cxBufferDestroy(&buf);
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
818 }
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
686
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
821 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
822 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
823 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
824 create_req_buffer(client);
691
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
825 client->transfer_buffer_pos = 0;
4d8a55a7618b handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 690
diff changeset
826 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
827 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
828
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
829 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
830 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
831 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
832 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
833 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
834 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
835
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
836 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
837 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
838 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
839 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
840
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
841 // test
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
842
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
843 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
844 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
845 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
846 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
847 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
848 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
849 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
850
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
851 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
852 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
853 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
854 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
855 continue;
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
856 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
857 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
858
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
859 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
860 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
861
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
862 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
863 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
864 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
865 continue;
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
866 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
867 } else {
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
868 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
869 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
870
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
871 break;
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
872 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
873
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
874 // cleanup
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
875 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
876 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
877 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
878 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
879
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
880 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
881 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
882 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
883 "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
884 "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
885 "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
886 "\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
887
686
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
888 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
889
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
890 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
891 "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
892 "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
893 "\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
894
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
895 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
896 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
897 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
898
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
899 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
900 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
901 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
902 "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
903 "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
904 "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
905 "\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
906 "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
907 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
908
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
909 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
910 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
911 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
912
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
913 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
914 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
915 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
916
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
917 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
918 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
919 // 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
920 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
921 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
922 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
923 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
924 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
925 *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
926 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
927 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
928
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
929 // 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
930 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
931 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
932 "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
933 "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
934 "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
935 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
936 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
937 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
938 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
939 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
940
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
941 // 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
942 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
943
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
944 // test
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_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
946 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
947 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
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 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
950 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
951 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
952 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
953
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
954 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
955 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
956 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
957
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
958 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
959 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
960 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
961 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
962 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
963 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
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 // 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
966 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
967 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
968 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
969 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
970 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
971 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
972
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
973 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
974
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
975 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
976 testr.response = out_buf;
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
977 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
978 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
979 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
980 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
981 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
982
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
983 // 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
984 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
985 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
986 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
987 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
988 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
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 // 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
991 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
992 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
993 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
994 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
995 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
996 break;
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
997 }
686
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
998 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
999 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
1000 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
1001 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
1002 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
1003 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
1004 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
1005
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1006 const char *response_str = response.ptr;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1007 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
1008 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
1009
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
1010 // send response and do IO
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1011 int in_progress = 1;
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1012 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
1013 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
1014 if(len > 0) {
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1015 if(len > write_blocksz) {
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1016 len = write_blocksz;
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1017 }
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1018 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
1019 if(w == 0) {
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1020 break;
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1021 }
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1022 CX_TEST_ASSERT(w > 0);
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1023 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
1024 }
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1025
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1026 ret = client_io(&dummy, &event);
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1027 if(ret == 0) {
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1028 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
1029 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
1030
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
1031 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
1032 }
686
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
1033 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
1034 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
1035 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
1036 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
1037
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
1038 // cleanup
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
1039 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
1040 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
1041 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
1042 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
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
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1045 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
1046 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
1047 "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
1048 "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
1049 "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
1050 "\r\n"
690
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1051 "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
1052 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
1053
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1054 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
1055 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
1056 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
1057
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
1058 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
1059 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
1060
687
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1061 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
1062 CX_TEST_DO {
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1063 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
1064 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1065 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1066
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1067 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
1068 CX_TEST_DO {
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1069 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
1070 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1071 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1072
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1073 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
1074 CX_TEST_DO {
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1075 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
1076 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1077 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1078
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1079 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
1080 CX_TEST_DO {
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1081 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
1082 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1083 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1084
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1085 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
1086 CX_TEST_DO {
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1087 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
1088 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1089 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1090
690
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1091 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
1092 int ctlen = 1024*1024*32;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1093 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
1094 cx_bprintf(resp,
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1095 "HTTP/1.1 200 OK\r\n"
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1096 "Host: localhost\r\n"
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1097 "Content-length: %d\r\n"
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1098 "\r\n",
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1099 ctlen);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1100 size_t content_start = resp->pos;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1101 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
1102 memset(resp->space + resp->pos, 'x', ctlen);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1103 resp->pos += ctlen;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1104 resp->size += ctlen;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1105
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1106 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
1107
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1108 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
1109 CX_TEST_ASSERT(buf->size == ctlen);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1110 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
1111
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1112 cxBufferFree(resp);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1113 cxBufferFree(buf);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1114 }
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1115
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1116 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
1117 CX_TEST_DO {
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1118 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
1119 }
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1120 }
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1121
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1122 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
1123 CX_TEST_DO {
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1124 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
1125 }
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1126 }
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1127
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1128 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
1129 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
1130 "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
1131 "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
1132 "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
1133 "\r\n"
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1134 "d\r\n"
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1135 "Hello World!\n"
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1136 "\r\n"
690
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1137 "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
1138 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
1139
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1140 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
1141 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
1142 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
1143
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1144 cxBufferFree(buf);
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1145 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1146
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1147 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
1148 CX_TEST_DO {
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1149 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
1150 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1151 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1152
688
02360295ec58 fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
1153 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
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_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
1156 }
02360295ec58 fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
1157 }
02360295ec58 fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
1158
687
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_chunked_transfer_8b) {
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_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
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_chunked_transfer_64b) {
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_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
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
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1171 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
1172 int chunk1 = 1024*1024*2;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1173 int chunk2 = 1024*128;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1174 int chunk3 = 123;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1175 int chunk4 = 1024*1024*5;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1176 int chunk5 = 1024*16;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1177
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1178 char *chunkbuf = malloc(chunk4);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1179
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1180 int ctlen = chunk1 + chunk2 + chunk3 + chunk4 + chunk5;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1181 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
1182 cx_bprintf(resp,
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1183 "HTTP/1.1 200 OK\r\n"
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1184 "Transfer-encoding: chunked\r\n"
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1185 "\r\n",
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1186 ctlen);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1187 size_t content_start = resp->pos;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1188 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
1189
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1190 memset(chunkbuf, 'x', chunk1);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1191 cx_bprintf(resp, "%x\r\n", chunk1);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1192 int chunk1_pos = resp->pos;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1193 cxBufferWrite(chunkbuf, 1, chunk1, resp);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1194 cxBufferPutString(resp, "\r\n");
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1195
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1196 memset(chunkbuf, '2', chunk2);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1197 cx_bprintf(resp, "%x\r\n", chunk2);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1198 int chunk2_pos = resp->pos;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1199 cxBufferWrite(chunkbuf, 1, chunk2, resp);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1200 cxBufferPutString(resp, "\r\n");
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1201
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1202 memset(chunkbuf, 'c', chunk3);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1203 cx_bprintf(resp, "%x\r\n", chunk3);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1204 int chunk3_pos = resp->pos;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1205 cxBufferWrite(chunkbuf, 1, chunk3, resp);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1206 cxBufferPutString(resp, "\r\n");
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 memset(chunkbuf, '4', chunk4);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1209 cx_bprintf(resp, "%x\r\n", chunk4);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1210 int chunk4_pos = resp->pos;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1211 cxBufferWrite(chunkbuf, 1, chunk4, resp);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1212 cxBufferPutString(resp, "\r\n");
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 memset(chunkbuf, 'z', chunk5);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1215 cx_bprintf(resp, "%x\r\n", chunk5);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1216 int chunk5_pos = resp->pos;
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1217 cxBufferWrite(chunkbuf, 1, chunk5, resp);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1218 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
1219
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1220
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1221 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
1222
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1223 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
1224 CX_TEST_ASSERT(buf->size == ctlen);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1225 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
1226 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
1227 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
1228 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
1229 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
1230
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1231 cxBufferFree(resp);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1232 cxBufferFree(buf);
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1233 }
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1234
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1235 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
1236 CX_TEST_DO {
692
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1237 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
1238 }
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1239 }
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1240
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1241 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
1242 CX_TEST_DO {
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1243 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
1244 }
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1245 }
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1246
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1247 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
1248 CX_TEST_DO {
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1249 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
1250 }
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1251 }
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1252
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1253 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
1254 CX_TEST_DO {
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1255 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
1256 }
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1257 }
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1258
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1259 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
1260 CX_TEST_DO {
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1261 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
1262 }
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1263 }
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1264
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1265 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
1266 CX_TEST_DO {
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1267 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
1268 }
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1269 }
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1270
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1271 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
1272 CX_TEST_DO {
32faa1d6a744 add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 691
diff changeset
1273 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
1274 }
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1275 }
c7b73000a1ed add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 688
diff changeset
1276
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
1277 void http_client_add_tests(CxTestSuite *suite) {
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
1278 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
1279 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
1280 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
1281 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
1282 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
1283 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
1284 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
1285 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
1286 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
1287 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
1288 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
1289 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
1290 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
1291 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
1292 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
1293 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
1294 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
1295 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
1296 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
1297 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
1298 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
1299 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
1300 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
1301 }

mercurial