src/server/proxy/httpclient.c

Thu, 19 Feb 2026 18:34:36 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Thu, 19 Feb 2026 18:34:36 +0100
changeset 687
4bded456b4a7
parent 686
9adf57ddcd0f
permissions
-rw-r--r--

add test for http client responses with chunked transfer encoding

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>
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
35 #include <stdlib.h>
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
36 #include <string.h>
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
37 #include <errno.h>
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
38
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
39 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
40 static int client_io(EventHandler *ev, Event *event);
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
41 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
42
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
43 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
44 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
45 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
46 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
47
665
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
48 HttpClient* http_client_new(EventHandler *ev) {
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
49 CxMempool *mp = cxMempoolCreate(32, CX_MEMPOOL_TYPE_PURE);
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
50 if(!mp) {
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
51 return NULL;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
52 }
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 HttpClient *client = malloc(sizeof(HttpClient));
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
55 HeaderArray *req_headers = header_array_create();
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
56 HeaderArray *resp_headers = header_array_create();
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
57 if(!client || !req_headers || !resp_headers) {
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
58 free(client);
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
59 header_array_free(req_headers);
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
60 header_array_free(resp_headers);
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
61 cxMempoolFree(mp);
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
62 return NULL;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
63 }
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 memset(client, 0, sizeof(HttpClient));
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
66 client->ev = ev;
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
67 client->socketfd = -1;
665
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
68 client->request_headers = req_headers;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
69 client->response_headers = resp_headers;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
70
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
71 client->buffer.maxsize = HTTP_CLIENT_BUFFER_SIZE;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
72 client->buffer.inbuf = malloc(HTTP_CLIENT_BUFFER_SIZE);
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
73 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
74 if(!parser || !client->buffer.inbuf) {
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
75 http_client_free(client);
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
76 return NULL;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
77 }
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
78 client->parser = parser;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
79
665
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
80 return client;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
81 }
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
82
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
83 void http_client_free(HttpClient *client) {
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
84 cxMempoolFree(client->mp);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
85 header_array_free(client->request_headers);
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
86 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
87 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
88 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
89 }
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
90 free(client->buffer.inbuf);
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
91 free(client->addr);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
92 free(client->method);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
93 free(client->uri);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
94 free(client);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
95 }
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
96
665
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
97 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
98 free(client->addr);
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
99 client->addr = NULL;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
100 client->addrlen = 0;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
101
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
102 void *newaddr = malloc(addrlen);
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
103 if(!newaddr) {
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
104 return 1;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
105 }
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
106 memcpy(newaddr, addr, addrlen);
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
107 client->addr = newaddr;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
108 client->addrlen = addrlen;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
109
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
110 return 0;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
111 }
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
112
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
113 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
114 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
115 }
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 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
118 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
119 }
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 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
122 free(*ptr);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
123 if(str) {
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
124 char *newvalue = malloc(len+1);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
125 if(!newvalue) {
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
126 *ptr = NULL;
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
127 return 1;
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
128 }
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
129 memcpy(newvalue, str, len);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
130 newvalue[len] = 0;
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
131 *ptr = newvalue;
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
132 } else {
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
133 *ptr = NULL;
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
134 }
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
135 return 0;
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
136 }
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 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
139 return client_set_str(&client->method, method, len);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
140 }
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 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
143 return client_set_str(&client->uri, uri, len);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
144 }
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
145
665
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
146 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
147 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
148 }
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 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
151 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
152 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
153 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
154 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
155 }
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
665
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
158 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
159 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
160
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
161 int err = 1;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
162 if(n.ptr && v.ptr) {
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
163 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
164 }
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
165 if(err) {
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
166 cxFree(client->mp->allocator, n.ptr);
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
167 cxFree(client->mp->allocator, v.ptr);
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
168 }
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
169 return err;
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
170 }
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
171
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
172 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
173 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
174 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
175 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
176 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
177 }
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 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
180 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
181 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
182 }
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
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
184 int http_client_start(HttpClient *client) {
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
185 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
186 if(socketfd < 0) {
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
187 return 1;
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
188 }
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
189
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
190 if(util_socket_setnonblock(socketfd, 1)) {
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
191 close(socketfd);
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
192 return 1;
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
193 }
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
194
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
195 client->socketfd = socketfd;
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
196
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
197 client->writeev.cookie = client;
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
198 client->writeev.fn = client_connected;
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
199
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
200 int ret = 1;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
201 if(connect(socketfd, client->addr, client->addrlen)) {
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
202 int err = errno;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
203 if(err == EINPROGRESS) {
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
204 ret = ev_pollout(client->ev, socketfd, &client->writeev);
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
205 } else {
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
206 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
207 }
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
208 } else {
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
209 // TODO: call client_connected directly
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
210 }
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
211
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
212 if(ret) {
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
213 close(socketfd);
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
214 }
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 668
diff changeset
215 return ret;
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
216 }
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 static int create_req_buffer(HttpClient *client) {
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
219 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
220 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
221 return 1;
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
222 }
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
223
668
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
224 if(client->method) {
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
225 cxBufferPutString(&buf, "GET ");
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
226 } else {
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
227 cxBufferPutString(&buf, client->method);
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
228 }
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
229 cxBufferPutString(&buf, client->uri ? client->uri : "/");
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
230 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
231
668
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
232 HeaderArray *hdr = client->request_headers;
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
233 while(hdr) {
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
234 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
235 cxBufferPutString(&buf, hdr->headers[i].name);
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
236 cxBufferPutString(&buf, ": ");
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
237 cxBufferPutString(&buf, hdr->headers[i].value);
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
238 cxBufferPutString(&buf, "\r\n");
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
239 }
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
240 hdr = hdr->next;
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
241 }
0a7d1e9ca6b8 implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 666
diff changeset
242 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
243 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
244 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
245 client->transfer_buffer_len = buf.size;
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
246
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
247 return 0;
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
248 }
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 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
251 HttpClient *client = event->cookie;
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
252 if(create_req_buffer(client)) {
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
253 // TODO: set error
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
254 return 0; // end
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
255 }
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
256 event->fn = client_io;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
257
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
258 return client_io(ev, event);
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
259 }
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 static int client_io(EventHandler *ev, Event *event) {
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
262 HttpClient *client = event->cookie;
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
263 if(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
264 if(client_send_request(client)) {
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
265 return client->error == 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
266 }
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
267 }
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
268
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 // do we need to send a request body?
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
270 if(client->req_content_length != 0) {
679
4885cd4c3754 httpclient: move code for sending the request body to a separate function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 676
diff changeset
271 if(client_send_request_body(client)) {
4885cd4c3754 httpclient: move code for sending the request body to a separate function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 676
diff changeset
272 return client->error == 0;
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
273 }
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
274 }
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
275
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
276 // writing complete, switch to read events
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
277 event->events = EVENT_POLLIN;
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
278
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
279 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
280 return client->error == 0;
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
281 }
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
282 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
283 return client->error == 0;
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
284 }
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
285
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
286 return 0;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
287 }
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
288
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
289 static int client_finished(EventHandler *ev, Event *event) {
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
290 HttpClient *client = event->cookie;
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 close(client->socketfd);
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
293 client->socketfd = -1;
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 // request finished
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
296 if(client->response_finished) {
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
297 client->response_finished(client, client->response_finished_userdata);
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
298 }
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
299
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
300 return 0;
666
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
301 }
c99e0b352e36 add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
302
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
303 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
304 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
305 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
306 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
307 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
308 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
309 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
310 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
311 }
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 }
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
313
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
314 if(w <= 0) {
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
315 if(errno != EAGAIN) {
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
316 // TODO: log correct host
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
317 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
318 client->error = 1;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
319 }
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
320 return 1;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
321 }
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 669
diff changeset
322
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
323 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
324 }
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
325
680
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
326 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
327 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
328 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
329 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
330 // chunked transfer encoding:
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
331 // 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
332 // 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
333 rbody_readsize -= 16;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
334 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
335 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
336 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
337 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
338 if(r <= 0) {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
339 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
340 return 1;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
341 } 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
342 // EOF
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
343 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
344 break;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
345 } else {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
346 // error
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
347 client->error = 1;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
348 return 1;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
349 }
681
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
350 } 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
351 // 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
352 // 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
353 // 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
354 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
355 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
356 if(r > 0) {
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
357 r += r2;
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
358 } 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
359 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
360 r += 5;
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
361 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
362 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
363 } 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
364 return 1;
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
365 } else {
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
366 client->error = 1;
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
367 return 1;
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
368 }
680
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
369 }
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
370
680
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
371 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
372 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
373 char chunkheader[16];
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
374 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
375 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
376 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
377 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
378
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
379 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
380 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
381 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
382 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
383 return 1;
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
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
387 // chunked transfer encoding: terminate
681
e9705d51866a optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 680
diff changeset
388 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
389 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
390 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
391 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
392 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
393 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
394 return 1;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
395 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
396
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
397 } 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
398 // incomplete request body
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
399 client->error = 1;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
400 return 1;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
401 }
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 return 0;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
404 }
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
405
683
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
406 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
407 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
408 return 0;
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
409 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
410
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
411 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
412 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
413
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
414 ssize_t r;
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
415 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
416 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
417 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
418 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
419 case 0: { // finish
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
420 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
421 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
422 return 1;
683
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
423 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
424 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
425
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
426 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
427 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
428 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
429 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
430 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
431 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
432 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
433
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
434 // TODO: check ret
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
435 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
436 break;
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
437 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
438 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
439 continue;
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
440 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
441 case 2: { // error
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
442 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
443 return 1;
683
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
444 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
445 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
446 }
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
447
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
448 // 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
449 break;
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
450 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
451
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
452 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
453 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
454 // 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
455 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
456 } 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
457 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
458 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
459 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
460 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
461 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
462
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
463 // 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
464 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
465 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
466 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
467 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
468 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
469 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
470 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
471 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
472 break;
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 } 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
475 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
476 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
477 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
478 break;
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
479 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
480 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
481 }
686
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
482
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
483 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
484 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
485 }
683
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
486 }
684
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 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
489 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
490 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
491 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
492 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
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 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
495 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
496 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
497 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
498 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
499 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
500 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
501 } 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
502 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
503 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
504 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
505 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
506
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
507 return 0;
683
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
508 }
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
509
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
510 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
511 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
512 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
513 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
514
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
515 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
516 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
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 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
519 while((r = net_read(&client->stream->st, buf, 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
520 if(client->response_body_write) {
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
521 int ret = client->response_body_write(client, buf, r, client->response_body_write_userdata);
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
522 // TODO: check ret
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
523 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
524 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
525
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
526 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
527 if(r != HTTP_CLIENT_CALLBACK_WOULD_BLOCK) {
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
528 client->error;
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
529 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
530 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
531 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
532
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
533 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
534 }
683
db37761a8494 enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 682
diff changeset
535
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
536 /* --------------------------------- Tests --------------------------------- */
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
537
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
538 static CX_TEST(test_http_client_send_request) {
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
539 CX_TEST_DO {
674
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
540 EventHandler dummy;
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
541 HttpClient *client = http_client_new(&dummy);
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
542
674
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
543 int fds[2];
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
544 util_socketpair(fds);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
545 util_socket_setnonblock(fds[0], 1);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
546 util_socket_setnonblock(fds[1], 1);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
547 client->socketfd = fds[0];
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
548 int sock = fds[1];
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
549
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
550 // 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
551 // 32mb should be enough
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
552 size_t len = 32*1024*1024;
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
553 char *str = malloc(len);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
554 // init the buffer with random data
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
555 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
556 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
557 *p = rand();
674
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
558 }
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
559
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
560 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
561 client->transfer_buffer_len = len;
674
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
562
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
563 // test client_send_request
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
564
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
565 int ret = client_send_request(client);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
566 // 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
567 // 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
568 // 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
569 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
570 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
571 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
572
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
573 // 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
574 CxBuffer buf;
676
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
575 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
576 char tmpbuf[1024];
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
577 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
578 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
579 ssize_t r = read(sock, tmpbuf, 1024);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
580 CX_TEST_ASSERT(r >= 0);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
581 cxBufferWrite(tmpbuf, 1, r, &buf);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
582 ret = client_send_request(client);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
583 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
584
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
585 writes++;
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
586 }
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
587 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
588
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
589 // finish reading the request buffer from sock
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
590 ssize_t r;
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
591 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
592 cxBufferWrite(tmpbuf, 1, r, &buf);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
593 writes++;
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
594 }
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
595
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
596 CX_TEST_ASSERT(buf.size == len);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
597 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
598
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
599 // cleanup
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
600 close(fds[0]);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
601 close(fds[1]);
6a031133a498 add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 673
diff changeset
602 http_client_free(client);
676
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
603 cxBufferDestroy(&buf);
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
604 }
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
605 }
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
606
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
607 typedef struct TestResponse {
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
608 int status;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
609 char *msg;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
610 CxBuffer *response;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
611 } TestResponse;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
612
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
613 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
614 TestResponse *test = userdata;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
615 test->status = status;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
616 test->msg = strdup(msg);
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
617 return 0;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
618 }
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
619
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
620 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
621 TestResponse *test = userdata;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
622 cxBufferWrite(buf, 1, size, test->response);
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
623 return size;
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
624 }
d43f1dd8b18e add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
625
680
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
626
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
627 typedef struct TestRequestBody {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
628 char *content;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
629 size_t length;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
630 size_t pos;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
631 int chunksize;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
632 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
633 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
634 } TestRequestBody;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
635
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
636 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
637 TestRequestBody *req = userdata;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
638 req->cur_reads++;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
639 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
640 return -1;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
641 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
642 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
643 if(max == 0) {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
644 return 0;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
645 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
646
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
647 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
648 if(sz > max) {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
649 sz = max;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
650 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
651 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
652 req->pos += sz;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
653 return sz;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
654 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
655
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
656 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
657 CX_TEST_DO {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
658 EventHandler dummy;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
659 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
660 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
661 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
662
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
663 int fds[2];
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
664 util_socketpair(fds);
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
665 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
666 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
667 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
668 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
669
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
670 // response buffer
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
671 CxBuffer buf;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
672 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
673
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
674 // test
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
675 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
676 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
677 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
678 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
679 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
680 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
681
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
682 TestRequestBody req;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
683 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
684 req.length = 1024;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
685 req.pos = 0;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
686 req.chunksize = 16;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
687 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
688 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
689 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
690 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
691
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
692 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
693 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
694 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
695
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
696 // 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
697 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
698 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
699 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
700 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
701 char buf2[1024];
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
702 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
703 if(r > 0) {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
704 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
705 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
706 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
707
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
708 // 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
709 // (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
710 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
711
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
712 // 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
713 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
714 req.chunksize = 128;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
715 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
716 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
717 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
718 char buf2[2048];
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
719 ssize_t r;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
720 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
721 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
722 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
723 if(ret == 0) {
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
724 break;
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
725 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
726 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
727 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
728
682
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
729 // verify chunks
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
730 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
731 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
732
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
733 int pos = 0;
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
734 int chunklen = 0;
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
735 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
736 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
737 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
738 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
739 chunkheader.length = 1;
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
740 }
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
741 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
742 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
743 if(chunklen == 0) {
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
744 break;
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
745 }
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
746
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
747 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
748 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
749 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
750 pos += chunklen;
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
751 str = data + chunklen;
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
752 }
f4c593a99266 verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 681
diff changeset
753 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
754
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
755 // cleanup
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
756 close(fds[0]);
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
757 close(fds[1]);
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
758 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
759 cxBufferDestroy(&buf);
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
760 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
761 }
02935baa186b httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 679
diff changeset
762
686
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
763 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
764 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
765 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
766 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
767 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
768
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
769 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
770 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
771 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
772 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
773 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
774 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
775
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
776 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
777 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
778 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
779 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
780
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
781 // test
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
782
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
783 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
784 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
785 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
786 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
787 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
788 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
789 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
790
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
791 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
792 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
793 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
794 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
795 continue;
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
796 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
797 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
798
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
799 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
800 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
801
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
802 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
803 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
804 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
805 continue;
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
806 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
807 } else {
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
808 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
809 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
810
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
811 break;
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
812 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
813
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
814 // cleanup
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
815 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
816 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
817 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
818 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
819
684
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
820 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
821 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
822 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
823 "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
824 "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
825 "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
826 "\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
827
686
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
828 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
829
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
830 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
831 "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
832 "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
833 "\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
834
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
835 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
836 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
837 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
838
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
839 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
840 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
841 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
842 "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
843 "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
844 "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
845 "\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
846 "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
847 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
848
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
849 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
850 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
851 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
852
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
853 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
854 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
855 }
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 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
858 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
859 // 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
860 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
861 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
862 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
863 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
864 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
865 *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
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 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
868
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
869 // 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
870 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
871 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
872 "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
873 "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
874 "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
875 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
876 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
877 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
878 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
879 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
880
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
881 // 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
882 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
883
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
884 // test
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
885 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
886 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
887 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
888
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
889 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
890 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
891 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
892 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
893
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
894 static CX_TEST_SUBROUTINE(test_http_client_io, const char *response_str, int status_code, const char *msg, CxBuffer *out_buf, size_t write_blocksz) {
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
895 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
896 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
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 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
899 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
900 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
901 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
902 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
903 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
904
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
905 // 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
906 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
907 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
908 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
909 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
910 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
911 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
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 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
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 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
916 testr.response = out_buf;
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
917 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
918 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
919 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
920 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
921
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
922 // 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
923 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
924 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
925 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
926 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
927 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
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 // 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
930 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
931 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
932 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
933 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
934 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
935 break;
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
936 }
686
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
937 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
938 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
939 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
940 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
941 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
942 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
943 CX_TEST_ASSERT(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
944
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
945 size_t response_str_len = strlen(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
946 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
947
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
948 // send response and do IO
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
949 while(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
950 size_t len = response_str_len - response_str_pos;
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
951 if(len > write_blocksz) {
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
952 len = write_blocksz;
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
953 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
954 ssize_t w = write(sock, response_str + response_str_pos, len);
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
955 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
956 break;
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 CX_TEST_ASSERT(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
959 response_str_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
960
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
961 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
962
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
963 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
964 }
686
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
965 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
966 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
967 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
968 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
969
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
970 // cleanup
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
971 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
972 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
973 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
974 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
975 }
9adf57ddcd0f fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
976
687
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
977 static CX_TEST_SUBROUTINE(test_http_client_io_simple, size_t blocksz) {
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 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
979 "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
980 "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
981 "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
982 "\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
983 "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
984 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
985
687
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
986 CX_TEST_CALL_SUBROUTINE(test_http_client_io, response_str, 200, "OK", buf, blocksz);
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
987 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
988 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
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 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
991 }
48da20bde908 refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
992
687
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
993 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
994 CX_TEST_DO {
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
995 CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 1);
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
996 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
997 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
998
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
999 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
1000 CX_TEST_DO {
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1001 CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 2);
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1002 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1003 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1004
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1005 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
1006 CX_TEST_DO {
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1007 CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 3);
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1008 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1009 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1010
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1011 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
1012 CX_TEST_DO {
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1013 CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 16);
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1014 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1015 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1016
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1017 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
1018 CX_TEST_DO {
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1019 CX_TEST_CALL_SUBROUTINE(test_http_client_io_simple, 512);
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1020 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1021 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1022
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1023 static CX_TEST_SUBROUTINE(test_http_client_io_chunked_transfer, size_t blocksz) {
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1024 char *response_str =
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1025 "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
1026 "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
1027 "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
1028 "\r\n"
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1029 "d\r\n"
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1030 "Hello World!\n"
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1031 "\r\n"
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1032 "0\r\n\r\n";
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1033 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
1034
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1035 CX_TEST_CALL_SUBROUTINE(test_http_client_io, response_str, 200, "OK", buf, blocksz);
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1036 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
1037 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
1038
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1039 cxBufferFree(buf);
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1040 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1041
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1042 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
1043 CX_TEST_DO {
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1044 CX_TEST_CALL_SUBROUTINE(test_http_client_io_chunked_transfer, 10);
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1045 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1046 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1047
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1048 /*
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1049 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
1050 CX_TEST_DO {
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1051 CX_TEST_CALL_SUBROUTINE(test_http_client_io_chunked_transfer, 16);
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1052 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1053 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1054
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1055 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
1056 CX_TEST_DO {
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1057 CX_TEST_CALL_SUBROUTINE(test_http_client_io_chunked_transfer, 64);
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1058 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1059 }
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1060 */
4bded456b4a7 add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 686
diff changeset
1061
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
1062 void http_client_add_tests(CxTestSuite *suite) {
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
1063 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
1064 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
1065 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
1066 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
1067 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
1068 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
1069 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
1070 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
1071 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
1072 cx_test_register(suite, 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
1073 cx_test_register(suite, test_http_client_io_chunked_transfer_1b);
673
144bdc33fdb6 add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 672
diff changeset
1074 }

mercurial