Thu, 05 Mar 2026 21:06:41 +0100
implement httpclient websocket IO
|
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); |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
268 | return size; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
269 | } |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
270 | |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
271 | static int create_req_buffer(HttpClient *client) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
272 | 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
|
273 | 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
|
274 | return 1; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
275 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
276 | |
|
668
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
277 | if(client->method) { |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
278 | cxBufferPutString(&buf, "GET "); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
279 | } else { |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
280 | cxBufferPutString(&buf, client->method); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
281 | } |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
282 | cxBufferPutString(&buf, client->uri ? client->uri : "/"); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
283 | 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
|
284 | |
|
668
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
285 | HeaderArray *hdr = client->request_headers; |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
286 | while(hdr) { |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
287 | 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
|
288 | cxBufferPutString(&buf, hdr->headers[i].name); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
289 | cxBufferPutString(&buf, ": "); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
290 | cxBufferPutString(&buf, hdr->headers[i].value); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
291 | cxBufferPutString(&buf, "\r\n"); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
292 | } |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
293 | hdr = hdr->next; |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
294 | } |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
295 | 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
|
296 | 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
|
297 | 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
|
298 | client->transfer_buffer_len = buf.size; |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
299 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
300 | return 0; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
301 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
302 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
303 | 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
|
304 | HttpClient *client = event->cookie; |
|
707
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
305 | client->last_event = event; |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
704
diff
changeset
|
306 | if(client->stage < 0) { |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
704
diff
changeset
|
307 | return 0; |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
704
diff
changeset
|
308 | } |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
309 | if(create_req_buffer(client)) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
310 | // TODO: set error |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
311 | return 0; // end |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
312 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
313 | event->fn = client_io; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
314 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
315 | return client_io(ev, event); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
316 | } |
|
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 | static int client_io(EventHandler *ev, Event *event) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
319 | HttpClient *client = event->cookie; |
|
707
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
320 | return client_process(client, event); |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
321 | } |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
322 | |
|
717
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
323 | static int client_ws_io(EventHandler *ev, Event *event) { |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
324 | HttpClient *client = event->cookie; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
325 | return client_ws_process(client, event); |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
326 | } |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
327 | |
|
707
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
328 | static int client_process(HttpClient *client, Event *event) { |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
329 | client->last_event = event; |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
704
diff
changeset
|
330 | if(client->stage < 0) { |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
704
diff
changeset
|
331 | return 0; |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
704
diff
changeset
|
332 | } |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
704
diff
changeset
|
333 | |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
334 | if(client->stage == 0) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
335 | 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
|
336 | if(client_send_buf(client)) { |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
337 | return client->error == 0; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
338 | } |
|
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
|
339 | } |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
340 | |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
341 | // do we need to send a request body? |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
342 | if(client->req_content_length != 0) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
343 | if(client_send_request_body(client)) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
344 | return client->error == 0; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
345 | } |
|
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
|
346 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
347 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
348 | |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
349 | // writing complete, switch to read events |
|
707
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
350 | |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
351 | if(client->event.events != EVENT_POLLIN) { |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
352 | if(&client->event != event) { |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
353 | // 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
|
354 | // actual HttpClient event. |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
355 | // 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
|
356 | // if needed |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
357 | if(ev_remove_poll(client->ev, client->socketfd)) { |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
358 | client->error = 1; |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
359 | return 1; |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
360 | } |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
361 | client->event.fn = NULL; |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
362 | } |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
363 | client->event.events = EVENT_POLLIN; |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
364 | |
|
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 | |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
367 | client->stage = 1; |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
368 | |
|
704
778dcf4ad63c
fix multiple reads could corrupt the httpclient buffer content
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
703
diff
changeset
|
369 | 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
|
370 | return client->error == 0; |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
371 | } |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
372 | int ret = 0; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
373 | if(client->stage == 2) { |
|
717
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
374 | return client_ws_process(client, event); |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
375 | } |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
376 | if(client_read_response_body(client)) { |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
377 | ret = 1; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
378 | } |
|
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 | 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
|
381 | return client->error == 0; |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
382 | } |
|
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 | return 0; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
385 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
386 | |
|
717
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
387 | static int client_ws_process(HttpClient *client, Event *event) { |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
388 | // send available data from the transfer buffer |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
389 | int ret = client_send_buf(client); |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
390 | if(client->error) { |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
391 | return 0; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
392 | } |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
393 | // readiness notification |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
394 | if(ret == 0 && client->ws_msg_ready) { |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
395 | if(client->ws_msg_ready(client, client->ws_msg_ready_userdata)) { |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
396 | return 0; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
397 | } |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
398 | } |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
399 | |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
400 | // read message |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
401 | char *buf = client->transfer2_buffer + client->transfer2_buffer_pos; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
402 | 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
|
403 | ssize_t r = -1; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
404 | while(available > 0) { |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
405 | ssize_t r = net_read(client->stream, buf, available); |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
406 | if(r <= 0) { |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
407 | break; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
408 | } |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
409 | client->transfer2_buffer_len += r; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
410 | if(client->ws_write) { |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
411 | char *out = client->transfer2_buffer + client->transfer2_buffer_pos; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
412 | 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
|
413 | while(nbytes > 0) { |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
414 | 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
|
415 | if(w == HTTP_CLIENT_CALLBACK_WOULD_BLOCK) { |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
416 | break; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
417 | } else if(w <= 0) { |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
418 | client->error = 1; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
419 | return 0; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
420 | } |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
421 | client->transfer2_buffer_pos += w; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
422 | |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
423 | // adjust buffer |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
424 | out = client->transfer2_buffer + client->transfer2_buffer_pos; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
425 | nbytes = client->transfer2_buffer_len - client->transfer2_buffer_pos; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
426 | } |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
427 | } else { |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
428 | // noop |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
429 | client->transfer2_buffer_pos = client->transfer2_buffer_len; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
430 | } |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
431 | |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
432 | // adjust buffer |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
433 | buf = client->transfer2_buffer + client->transfer2_buffer_pos; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
434 | available = client->transfer2_buffer_alloc - client->transfer2_buffer_len; |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
435 | } |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
436 | |
|
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
437 | return r == 0 || client->error ? 0 : 1; |
|
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 | |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
440 | static int client_finished(EventHandler *ev, Event *event) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
441 | HttpClient *client = event->cookie; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
442 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
443 | close(client->socketfd); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
444 | client->socketfd = -1; |
|
707
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
445 | client->stage = -1; |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
446 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
447 | // request finished |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
448 | if(client->response_finished) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
449 | client->response_finished(client, client->response_finished_userdata); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
450 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
451 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
452 | return 0; |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
453 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
454 | |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
455 | // 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
|
456 | 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
|
457 | 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
|
458 | 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
|
459 | 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
|
460 | 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
|
461 | 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
|
462 | 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
|
463 | 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
|
464 | } |
|
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 | } |
|
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 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
467 | if(w <= 0) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
468 | if(errno != EAGAIN) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
469 | // TODO: log correct host |
|
707
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
470 | 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
|
471 | client->error = 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
472 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
473 | return 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
474 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
475 | |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
476 | 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
|
477 | } |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
478 | |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
479 | 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
|
480 | 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
|
481 | 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
|
482 | 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
|
483 | // chunked transfer encoding: |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
484 | // 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
|
485 | // 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
|
486 | rbody_readsize -= 16; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
487 | 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
|
488 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
489 | 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
|
490 | 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
|
491 | if(r <= 0) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
492 | 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
|
493 | return 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
494 | } 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
|
495 | // EOF |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
496 | 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
|
497 | break; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
498 | } else { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
499 | // error |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
500 | client->error = 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
501 | return 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
502 | } |
|
681
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
503 | } 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
|
504 | // 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
|
505 | // 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
|
506 | // 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
|
507 | 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
|
508 | 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
|
509 | if(r > 0) { |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
510 | r += r2; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
511 | } 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
|
512 | 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
|
513 | r += 5; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
514 | 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
|
515 | 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
|
516 | } 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
|
517 | return 1; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
518 | } else { |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
519 | client->error = 1; |
|
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 | } |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
522 | } |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
523 | |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
524 | 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
|
525 | 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
|
526 | char chunkheader[16]; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
527 | 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
|
528 | 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
|
529 | 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
|
530 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
531 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
532 | 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
|
533 | 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
|
534 | client->transfer_buffer_len = rbody_buf_offset + r; |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
535 | 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
|
536 | return 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
537 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
538 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
539 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
540 | // 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
|
541 | 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
|
542 | 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
|
543 | 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
|
544 | 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
|
545 | client->request_body_terminated = 1; |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
546 | 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
|
547 | return 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
548 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
549 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
550 | } 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
|
551 | // incomplete request body |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
552 | client->error = 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
553 | return 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
554 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
555 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
556 | return 0; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
557 | } |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
558 | |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
559 | // returns 0 success |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
560 | // 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
|
561 | 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
|
562 | 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
|
563 | return 0; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
564 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
565 | |
|
703
395c62fac7e5
add more httpclient tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
566 | 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
|
567 | 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
|
568 | |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
569 | ssize_t r; |
|
704
778dcf4ad63c
fix multiple reads could corrupt the httpclient buffer content
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
703
diff
changeset
|
570 | 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
|
571 | 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
|
572 | 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
|
573 | 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
|
574 | case 0: { // finish |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
575 | 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
|
576 | 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
|
577 | return 1; |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
578 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
579 | 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
|
580 | |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
581 | 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
|
582 | 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
|
583 | 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
|
584 | 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
|
585 | 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
|
586 | 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
|
587 | 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
|
588 | |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
589 | if(ret != 0) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
590 | if(ret != HTTP_CLIENT_CALLBACK_WOULD_BLOCK) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
591 | client->error = 1; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
592 | } |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
593 | return 1; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
594 | } |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
595 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
596 | break; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
597 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
598 | 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
|
599 | continue; |
|
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 2: { // error |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
602 | 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
|
603 | return 1; |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
604 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
605 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
606 | } |
|
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 | // 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
|
609 | break; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
610 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
611 | |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
612 | 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
|
613 | 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
|
614 | // 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
|
615 | 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
|
616 | } 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
|
617 | 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
|
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 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
620 | 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
|
621 | } |
|
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 | // 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
|
624 | 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
|
625 | 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
|
626 | int chunkedtransferenc = 0; |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
627 | cxmutstr hdr_connection = CX_NULLSTR; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
628 | 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
|
629 | 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
|
630 | for(int i=0;i<headers->len;i++) { |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
631 | cxmutstr header = headers->headers[i].name; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
632 | cxmutstr hvalue = headers->headers[i].value; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
633 | if(!cx_strcasecmp(header, "content-length")) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
634 | 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
|
635 | 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
|
636 | break; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
637 | } |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
638 | } else if(!cx_strcasecmp(header, "transfer-encoding")) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
639 | 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
|
640 | 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
|
641 | 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
|
642 | break; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
643 | } |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
644 | } else if(!cx_strcasecmp(header, "connection")) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
645 | hdr_connection = hvalue; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
646 | } |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
647 | |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
648 | if(client->statuscode == 101 && !cx_strcasecmp(header, "upgrade")) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
649 | 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
|
650 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
651 | } |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
652 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
653 | 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
|
654 | 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
|
655 | } |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
656 | } |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
657 | |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
658 | if(client->statuscode == 101) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
659 | 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
|
660 | client->stage = 2; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
661 | client->event.events = EVENT_POLLIN|EVENT_POLLOUT; |
|
717
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
662 | client->event.fn = client_ws_io; |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
663 | |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
664 | // prepare IO buffers for websockets |
|
717
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
665 | // transfer_buffer is used for outgoing traffic |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
666 | client->transfer_buffer_len = 0; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
667 | client->transfer_buffer_pos = 0; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
668 | |
|
717
2edcb361b8be
implement httpclient websocket IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
715
diff
changeset
|
669 | // transfer2_buffer is used for reading |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
670 | client->transfer2_buffer = malloc(HTTP_CLIENT_BUFFER_SIZE); |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
671 | if(!client->transfer2_buffer) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
672 | client->error = 1; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
673 | return 1; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
674 | } |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
675 | client->transfer2_buffer_alloc = HTTP_CLIENT_BUFFER_SIZE; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
676 | client->transfer2_buffer_len = 0; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
677 | client->transfer2_buffer_pos = 0; |
|
715
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
678 | |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
679 | IOStream *fd = Sysstream_new(NULL, client->socketfd); |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
680 | if(!fd) { |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
681 | client->error = 1; |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
682 | return 1; |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
683 | } |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
684 | HttpStream *http = (HttpStream*)httpstream_new(NULL, fd); |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
685 | if(!http) { |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
686 | fd->free(fd); |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
687 | } |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
688 | if(client->buffer.pos < client->buffer.cursize) { |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
689 | // bytes remaining in the buffer -> enable buffered reading |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
690 | httpstream_enable_buffered_read( |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
691 | &http->st, |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
692 | (char*)client->buffer.inbuf, |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
693 | client->buffer.maxsize, |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
694 | &client->buffer.cursize, |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
695 | &client->buffer.pos); |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
696 | } |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
697 | client->stream = http; |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
698 | } else { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
699 | // error: unknown protocol |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
700 | 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
|
701 | client->error = 1; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
702 | return 1; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
703 | } |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
704 | } 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
|
705 | 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
|
706 | 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
|
707 | 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
|
708 | 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
|
709 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
710 | 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
|
711 | 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
|
712 | 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
|
713 | } |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
714 | |
|
715
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
715 | // 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
|
716 | client->transfer2_buffer = client->transfer_buffer; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
717 | client->transfer2_buffer_alloc = client->transfer_buffer_alloc; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
718 | client->transfer2_buffer_len = 0; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
719 | client->transfer_buffer_pos = 0; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
720 | client->transfer_buffer = NULL; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
721 | client->transfer_buffer_alloc = 0; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
722 | |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
723 | 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
|
724 | http->max_read = contentlength; |
|
715
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
725 | httpstream_enable_buffered_read( |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
726 | &http->st, |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
727 | (char*)client->buffer.inbuf, |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
728 | client->buffer.maxsize, |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
729 | &client->buffer.cursize, |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
730 | &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
|
731 | } else if(chunkedtransferenc) { |
|
715
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
732 | httpstream_enable_chunked_read( |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
733 | &http->st, |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
734 | (char*)client->buffer.inbuf, |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
735 | client->buffer.maxsize, |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
736 | &client->buffer.cursize, |
|
30732c5b292c
httpclient: prepare httpstream for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
708
diff
changeset
|
737 | &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
|
738 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
739 | 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
|
740 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
741 | |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
742 | return 0; |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
743 | } |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
744 | |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
745 | // 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
|
746 | // transfer buffer |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
747 | // returns 0 success |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
748 | // 1 would block or error |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
749 | static int client_write_response(HttpClient *client) { |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
750 | while(client->transfer2_buffer_pos < client->transfer2_buffer_len) { |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
751 | char *buf = client->transfer2_buffer + client->transfer2_buffer_pos; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
752 | 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
|
753 | 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
|
754 | if(ret > 0) { |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
755 | client->transfer2_buffer_pos += ret; |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
756 | } else if(ret == 0) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
757 | // EOF? |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
758 | // 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
|
759 | 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
|
760 | return client->error; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
761 | } else { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
762 | if(ret != HTTP_CLIENT_CALLBACK_WOULD_BLOCK) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
763 | client->error = 1; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
764 | } |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
765 | return 1; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
766 | } |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
767 | } |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
768 | return 0; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
769 | } |
|
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 | // returns 0 success |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
772 | // 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
|
773 | 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
|
774 | 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
|
775 | 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
|
776 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
777 | |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
778 | // 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
|
779 | if(client_write_response(client)) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
780 | return 1; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
781 | } |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
782 | |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
783 | char *buf = client->transfer2_buffer; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
784 | 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
|
785 | |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
786 | 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
|
787 | 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
|
788 | client->transfer2_buffer_len = r; |
|
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
789 | 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
|
790 | if(client->response_body_write) { |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
791 | if(client_write_response(client)) { |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
792 | return 1; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
793 | } |
|
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 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
795 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
796 | |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
797 | 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
|
798 | 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
|
799 | 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
|
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 | 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
|
802 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
803 | |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
804 | 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
|
805 | } |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
682
diff
changeset
|
806 | |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
807 | /* --------------------------------- Tests --------------------------------- */ |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
808 | |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
809 | static CX_TEST(test_http_client_send_request) { |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
810 | CX_TEST_DO { |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
811 | EventHandler dummy; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
812 | HttpClient *client = http_client_new(&dummy); |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
813 | |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
814 | int fds[2]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
815 | util_socketpair(fds); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
816 | util_socket_setnonblock(fds[0], 1); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
817 | util_socket_setnonblock(fds[1], 1); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
818 | client->socketfd = fds[0]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
819 | int sock = fds[1]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
820 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
821 | // 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
|
822 | // 32mb should be enough |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
823 | size_t len = 32*1024*1024; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
824 | char *str = malloc(len); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
825 | // init the buffer with random data |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
826 | 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
|
827 | 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
|
828 | *p = rand(); |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
829 | } |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
830 | |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
831 | 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
|
832 | client->transfer_buffer_len = len; |
|
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 | // test client_send_request |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
835 | |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
836 | int ret = client_send_buf(client); |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
837 | // 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
|
838 | // 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
|
839 | // 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
|
840 | 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
|
841 | 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
|
842 | 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
|
843 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
844 | // 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
|
845 | CxBuffer buf; |
|
676
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
846 | 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
|
847 | char tmpbuf[1024]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
848 | 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
|
849 | 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
|
850 | ssize_t r = read(sock, tmpbuf, 1024); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
851 | CX_TEST_ASSERT(r >= 0); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
852 | cxBufferWrite(tmpbuf, 1, r, &buf); |
|
698
fea7c3d74cc6
prepare httpclient for websockets
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
853 | ret = client_send_buf(client); |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
854 | 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
|
855 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
856 | writes++; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
857 | } |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
858 | 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
|
859 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
860 | // finish reading the request buffer from sock |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
861 | ssize_t r; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
862 | 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
|
863 | cxBufferWrite(tmpbuf, 1, r, &buf); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
864 | writes++; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
865 | } |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
866 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
867 | CX_TEST_ASSERT(buf.size == len); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
868 | 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
|
869 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
870 | // cleanup |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
871 | close(fds[0]); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
872 | close(fds[1]); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
873 | http_client_free(client); |
|
676
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
874 | cxBufferDestroy(&buf); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
875 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
876 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
877 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
878 | typedef struct TestResponse { |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
879 | int status; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
880 | char *msg; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
881 | CxBuffer *response; |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
882 | int error_interval; |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
883 | int error_test; |
|
676
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
884 | } TestResponse; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
885 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
886 | 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
|
887 | TestResponse *test = userdata; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
888 | test->status = status; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
889 | test->msg = strdup(msg); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
890 | return 0; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
891 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
892 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
893 | 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
|
894 | TestResponse *test = userdata; |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
895 | 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
|
896 | test->error_test = 0; |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
897 | return HTTP_CLIENT_CALLBACK_WOULD_BLOCK; |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
898 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
899 | test->error_test++; |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
900 | |
|
676
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
901 | cxBufferWrite(buf, 1, size, test->response); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
902 | return size; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
903 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
904 | |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
905 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
906 | typedef struct TestRequestBody { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
907 | char *content; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
908 | size_t length; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
909 | size_t pos; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
910 | int chunksize; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
911 | 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
|
912 | 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
|
913 | } TestRequestBody; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
914 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
915 | 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
|
916 | TestRequestBody *req = userdata; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
917 | req->cur_reads++; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
918 | 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
|
919 | return -1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
920 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
921 | 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
|
922 | if(max == 0) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
923 | return 0; |
|
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 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
926 | 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
|
927 | if(sz > max) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
928 | sz = max; |
|
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 | 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
|
931 | req->pos += sz; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
932 | return sz; |
|
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 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
935 | 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
|
936 | CX_TEST_DO { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
937 | EventHandler dummy; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
938 | 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
|
939 | 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
|
940 | 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
|
941 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
942 | int fds[2]; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
943 | util_socketpair(fds); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
944 | 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
|
945 | 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
|
946 | 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
|
947 | 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
|
948 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
949 | // response buffer |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
950 | CxBuffer buf; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
951 | 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
|
952 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
953 | // test |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
954 | 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
|
955 | 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
|
956 | 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
|
957 | 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
|
958 | 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
|
959 | 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
|
960 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
961 | TestRequestBody req; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
962 | 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
|
963 | req.length = 1024; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
964 | req.pos = 0; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
965 | req.chunksize = 16; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
966 | 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
|
967 | 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
|
968 | 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
|
969 | 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
|
970 | |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
971 | 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
|
972 | 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
|
973 | 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
|
974 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
975 | // 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
|
976 | 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
|
977 | 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
|
978 | 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
|
979 | 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
|
980 | char buf2[1024]; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
981 | 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
|
982 | if(r > 0) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
983 | 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
|
984 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
985 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
986 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
987 | // 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
|
988 | // (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
|
989 | 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
|
990 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
991 | // 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
|
992 | 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
|
993 | req.chunksize = 128; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
994 | 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
|
995 | 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
|
996 | 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
|
997 | char buf2[2048]; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
998 | ssize_t r; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
999 | 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
|
1000 | 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
|
1001 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
1002 | if(ret == 0) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
1003 | break; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
1004 | } |
|
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 | 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
|
1007 | |
|
682
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
1008 | // verify chunks |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
1009 | 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
|
1010 | 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
|
1011 | |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
1012 | int pos = 0; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
1013 | int chunklen = 0; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
1014 | 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
|
1015 | 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
|
1016 | 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
|
1017 | 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
|
1018 | chunkheader.length = 1; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
1019 | } |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
1020 | 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
|
1021 | 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
|
1022 | if(chunklen == 0) { |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
1023 | break; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
1024 | } |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
1025 | |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
1026 | 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
|
1027 | 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
|
1028 | 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
|
1029 | pos += chunklen; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
1030 | str = data + chunklen; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
1031 | } |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
1032 | 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
|
1033 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
1034 | // cleanup |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
1035 | close(fds[0]); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
1036 | close(fds[1]); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
1037 | 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
|
1038 | cxBufferDestroy(&buf); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
1039 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
1040 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
1041 | |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1042 | 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
|
1043 | 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
|
1044 | 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
|
1045 | create_req_buffer(client); |
|
691
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
1046 | client->transfer_buffer_pos = 0; |
|
4d8a55a7618b
handle httpclient response write errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
690
diff
changeset
|
1047 | 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
|
1048 | 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
|
1049 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1050 | int fds[2]; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1051 | util_socketpair(fds); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1052 | util_socket_setnonblock(fds[0], 1); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1053 | util_socket_setnonblock(fds[1], 1); |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1054 | client->socketfd = fds[0]; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1055 | int sock = fds[1]; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1056 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1057 | 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
|
1058 | 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
|
1059 | 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
|
1060 | 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
|
1061 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1062 | // test |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1063 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1064 | 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
|
1065 | 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
|
1066 | 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
|
1067 | 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
|
1068 | 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
|
1069 | 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
|
1070 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1071 | |
|
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(!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
|
1073 | 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
|
1074 | 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
|
1075 | 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
|
1076 | continue; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1077 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1078 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1079 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1080 | 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
|
1081 | 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
|
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 | 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
|
1084 | 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
|
1085 | 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
|
1086 | continue; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1087 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1088 | } else { |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1089 | 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
|
1090 | } |
|
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 | break; |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1093 | } |
|
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 | // cleanup |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1096 | 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
|
1097 | 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
|
1098 | 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
|
1099 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1100 | |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
1101 | 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
|
1102 | 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
|
1103 | 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
|
1104 | "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
|
1105 | "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
|
1106 | "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
|
1107 | "\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
|
1108 | |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1109 | 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
|
1110 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1111 | 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
|
1112 | "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
|
1113 | "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
|
1114 | "\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
|
1115 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1116 | 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
|
1117 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1118 | } |
|
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 | 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
|
1121 | 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
|
1122 | 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
|
1123 | "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
|
1124 | "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
|
1125 | "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
|
1126 | "\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
|
1127 | "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
|
1128 | 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
|
1129 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1130 | 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
|
1131 | 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
|
1132 | 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
|
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 | 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
|
1135 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1136 | } |
|
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 | 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
|
1139 | 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
|
1140 | // 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
|
1141 | 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
|
1142 | 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
|
1143 | 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
|
1144 | 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
|
1145 | 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
|
1146 | *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
|
1147 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1148 | 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
|
1149 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1150 | // 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
|
1151 | 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
|
1152 | 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
|
1153 | "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
|
1154 | "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
|
1155 | "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
|
1156 | 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
|
1157 | 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
|
1158 | 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
|
1159 | 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
|
1160 | 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
|
1161 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1162 | // 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
|
1163 | 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
|
1164 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1165 | // test |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1166 | 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
|
1167 | 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
|
1168 | 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
|
1169 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1170 | 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
|
1171 | 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
|
1172 | } |
|
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 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1175 | 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
|
1176 | 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
|
1177 | 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
|
1178 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1179 | 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
|
1180 | 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
|
1181 | 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
|
1182 | 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
|
1183 | client->socketfd = fds[0]; |
|
708
027b16665f13
adjust test_http_client_io subroutine
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
707
diff
changeset
|
1184 | 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
|
1185 | 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
|
1186 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1187 | // 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
|
1188 | 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
|
1189 | 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
|
1190 | 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
|
1191 | 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
|
1192 | 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
|
1193 | 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
|
1194 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1195 | 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
|
1196 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1197 | 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
|
1198 | testr.response = out_buf; |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1199 | 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
|
1200 | 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
|
1201 | 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
|
1202 | 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
|
1203 | 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
|
1204 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1205 | // test IO |
|
708
027b16665f13
adjust test_http_client_io subroutine
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
707
diff
changeset
|
1206 | 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
|
1207 | 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
|
1208 | 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
|
1209 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1210 | // 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
|
1211 | 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
|
1212 | 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
|
1213 | 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
|
1214 | 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
|
1215 | 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
|
1216 | break; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
1217 | } |
|
686
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1218 | 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
|
1219 | req_header_pos += r; |
|
708
027b16665f13
adjust test_http_client_io subroutine
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
707
diff
changeset
|
1220 | 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
|
1221 | 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
|
1222 | 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
|
1223 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1224 | 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
|
1225 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1226 | const char *response_str = response.ptr; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1227 | 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
|
1228 | 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
|
1229 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1230 | // send response and do IO |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1231 | int in_progress = 1; |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1232 | 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
|
1233 | 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
|
1234 | if(len > 0) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1235 | if(len > write_blocksz) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1236 | len = write_blocksz; |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1237 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1238 | 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
|
1239 | if(w == 0) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1240 | break; |
|
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 | CX_TEST_ASSERT(w > 0); |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1243 | 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
|
1244 | } |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1245 | |
|
708
027b16665f13
adjust test_http_client_io subroutine
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
707
diff
changeset
|
1246 | ret = client_io(&dummy, &client->event); |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1247 | if(ret == 0) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1248 | 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
|
1249 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1250 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1251 | 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
|
1252 | } |
|
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 | 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
|
1254 | 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
|
1255 | 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
|
1256 | 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
|
1257 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1258 | // cleanup |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1259 | 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
|
1260 | 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
|
1261 | 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
|
1262 | 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
|
1263 | } |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1264 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1265 | 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
|
1266 | 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
|
1267 | "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
|
1268 | "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
|
1269 | "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
|
1270 | "\r\n" |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1271 | "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
|
1272 | 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
|
1273 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1274 | 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
|
1275 | 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
|
1276 | 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
|
1277 | |
|
9adf57ddcd0f
fix header iteration in client_read_response_header and add more tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
1278 | 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
|
1279 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
1280 | |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1281 | 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
|
1282 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1283 | 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
|
1284 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1285 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1286 | |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1287 | 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
|
1288 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1289 | 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
|
1290 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1291 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1292 | |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1293 | 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
|
1294 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1295 | 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
|
1296 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1297 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1298 | |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1299 | 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
|
1300 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1301 | 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
|
1302 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1303 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1304 | |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1305 | 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
|
1306 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1307 | 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
|
1308 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1309 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1310 | |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1311 | 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
|
1312 | int ctlen = 1024*1024*32; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1313 | 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
|
1314 | cx_bprintf(resp, |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1315 | "HTTP/1.1 200 OK\r\n" |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1316 | "Host: localhost\r\n" |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1317 | "Content-length: %d\r\n" |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1318 | "\r\n", |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1319 | ctlen); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1320 | size_t content_start = resp->pos; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1321 | 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
|
1322 | memset(resp->space + resp->pos, 'x', ctlen); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1323 | resp->pos += ctlen; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1324 | resp->size += ctlen; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1325 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1326 | 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
|
1327 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1328 | 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
|
1329 | CX_TEST_ASSERT(buf->size == ctlen); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1330 | 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
|
1331 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1332 | cxBufferFree(resp); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1333 | cxBufferFree(buf); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1334 | } |
|
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 | 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
|
1337 | CX_TEST_DO { |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1338 | 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
|
1339 | } |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1340 | } |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1341 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1342 | 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
|
1343 | CX_TEST_DO { |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1344 | 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
|
1345 | } |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1346 | } |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1347 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1348 | 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
|
1349 | 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
|
1350 | "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
|
1351 | "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
|
1352 | "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
|
1353 | "\r\n" |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1354 | "d\r\n" |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1355 | "Hello World!\n" |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1356 | "\r\n" |
|
690
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1357 | "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
|
1358 | 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
|
1359 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1360 | 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
|
1361 | 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
|
1362 | 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
|
1363 | |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1364 | cxBufferFree(buf); |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1365 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1366 | |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1367 | 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
|
1368 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1369 | 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
|
1370 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1371 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1372 | |
|
688
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
1373 | 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
|
1374 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1375 | 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
|
1376 | } |
|
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
1377 | } |
|
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
1378 | |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1379 | 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
|
1380 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1381 | 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
|
1382 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1383 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1384 | |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1385 | 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
|
1386 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1387 | 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
|
1388 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1389 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
1390 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1391 | 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
|
1392 | int chunk1 = 1024*1024*2; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1393 | int chunk2 = 1024*128; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1394 | int chunk3 = 123; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1395 | int chunk4 = 1024*1024*5; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1396 | int chunk5 = 1024*16; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1397 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1398 | char *chunkbuf = malloc(chunk4); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1399 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1400 | int ctlen = chunk1 + chunk2 + chunk3 + chunk4 + chunk5; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1401 | 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
|
1402 | cx_bprintf(resp, |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1403 | "HTTP/1.1 200 OK\r\n" |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1404 | "Transfer-encoding: chunked\r\n" |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1405 | "\r\n", |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1406 | ctlen); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1407 | size_t content_start = resp->pos; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1408 | 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
|
1409 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1410 | memset(chunkbuf, 'x', chunk1); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1411 | cx_bprintf(resp, "%x\r\n", chunk1); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1412 | int chunk1_pos = resp->pos; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1413 | cxBufferWrite(chunkbuf, 1, chunk1, resp); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1414 | cxBufferPutString(resp, "\r\n"); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1415 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1416 | memset(chunkbuf, '2', chunk2); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1417 | cx_bprintf(resp, "%x\r\n", chunk2); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1418 | int chunk2_pos = resp->pos; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1419 | cxBufferWrite(chunkbuf, 1, chunk2, resp); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1420 | cxBufferPutString(resp, "\r\n"); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1421 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1422 | memset(chunkbuf, 'c', chunk3); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1423 | cx_bprintf(resp, "%x\r\n", chunk3); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1424 | int chunk3_pos = resp->pos; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1425 | cxBufferWrite(chunkbuf, 1, chunk3, resp); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1426 | cxBufferPutString(resp, "\r\n"); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1427 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1428 | memset(chunkbuf, '4', chunk4); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1429 | cx_bprintf(resp, "%x\r\n", chunk4); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1430 | int chunk4_pos = resp->pos; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1431 | cxBufferWrite(chunkbuf, 1, chunk4, resp); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1432 | cxBufferPutString(resp, "\r\n"); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1433 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1434 | memset(chunkbuf, 'z', chunk5); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1435 | cx_bprintf(resp, "%x\r\n", chunk5); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1436 | int chunk5_pos = resp->pos; |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1437 | cxBufferWrite(chunkbuf, 1, chunk5, resp); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1438 | 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
|
1439 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1440 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1441 | 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
|
1442 | |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1443 | 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
|
1444 | CX_TEST_ASSERT(buf->size == ctlen); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1445 | 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
|
1446 | 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
|
1447 | 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
|
1448 | 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
|
1449 | 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
|
1450 | |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1451 | cxBufferFree(resp); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1452 | cxBufferFree(buf); |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1453 | } |
|
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 | 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
|
1456 | CX_TEST_DO { |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1457 | 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
|
1458 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1459 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1460 | |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1461 | 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
|
1462 | CX_TEST_DO { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1463 | 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
|
1464 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1465 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1466 | |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1467 | 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
|
1468 | CX_TEST_DO { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1469 | 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
|
1470 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1471 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1472 | |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1473 | 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
|
1474 | CX_TEST_DO { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1475 | 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
|
1476 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1477 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1478 | |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1479 | 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
|
1480 | CX_TEST_DO { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1481 | 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
|
1482 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1483 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1484 | |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1485 | 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
|
1486 | CX_TEST_DO { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1487 | 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
|
1488 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1489 | } |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1490 | |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1491 | 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
|
1492 | CX_TEST_DO { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
691
diff
changeset
|
1493 | 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
|
1494 | } |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1495 | } |
|
c7b73000a1ed
add large io http client tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
1496 | |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
1497 | void http_client_add_tests(CxTestSuite *suite) { |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
1498 | 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
|
1499 | 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
|
1500 | 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
|
1501 | 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
|
1502 | 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
|
1503 | 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
|
1504 | 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
|
1505 | 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
|
1506 | 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
|
1507 | 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
|
1508 | 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
|
1509 | 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
|
1510 | 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
|
1511 | 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
|
1512 | 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
|
1513 | 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
|
1514 | 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
|
1515 | 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
|
1516 | 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
|
1517 | 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
|
1518 | 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
|
1519 | 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
|
1520 | cx_test_register(suite, test_http_client_io_write_blsz8_error3); |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
1521 | } |