src/server/proxy/httpclient.c

Thu, 05 Mar 2026 21:39:39 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Thu, 05 Mar 2026 21:39:39 +0100
changeset 718
9e98618464ae
parent 717
2edcb361b8be
permissions
-rw-r--r--

add httpclient test for sending websocket messages

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

mercurial