Wed, 18 Feb 2026 10:53:55 +0100
verify chunks in test_http_client_send_request_body_chunked
|
662
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3 | * |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
4 | * Copyright 2026 Olaf Wintermann. All rights reserved. |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
5 | * |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
8 | * |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
11 | * |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
15 | * |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
|
662
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
29 | #include "httpclient.h" |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
30 | |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
31 | #include "../util/socket.h" |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
32 | |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
33 | #include <cx/buffer.h> |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
34 | #include <cx/string.h> |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
35 | #include <stdlib.h> |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
36 | #include <string.h> |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
37 | #include <errno.h> |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
38 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
39 | static int client_connected(EventHandler *ev, Event *event); |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
40 | static int client_io(EventHandler *ev, Event *event); |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
41 | static int client_finished(EventHandler *ev, Event *event); |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
42 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
43 | static int client_send_request(HttpClient *client); |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
44 | static int client_send_request_body(HttpClient *client); |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
45 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
46 | HttpClient* http_client_new(EventHandler *ev) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
47 | CxMempool *mp = cxMempoolCreate(32, CX_MEMPOOL_TYPE_PURE); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
48 | if(!mp) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
49 | return NULL; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
50 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
51 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
52 | HttpClient *client = malloc(sizeof(HttpClient)); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
53 | HeaderArray *req_headers = header_array_create(); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
54 | HeaderArray *resp_headers = header_array_create(); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
55 | if(!client || !req_headers || !resp_headers) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
56 | free(client); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
57 | header_array_free(req_headers); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
58 | header_array_free(resp_headers); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
59 | cxMempoolFree(mp); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
60 | return NULL; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
61 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
62 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
63 | memset(client, 0, sizeof(HttpClient)); |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
64 | client->ev = ev; |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
65 | client->socketfd = -1; |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
66 | client->request_headers = req_headers; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
67 | client->response_headers = resp_headers; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
68 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
69 | client->buffer.maxsize = HTTP_CLIENT_BUFFER_SIZE; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
70 | client->buffer.inbuf = malloc(HTTP_CLIENT_BUFFER_SIZE); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
71 | 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
|
72 | if(!parser || !client->buffer.inbuf) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
73 | http_client_free(client); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
74 | return NULL; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
75 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
76 | client->parser = parser; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
77 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
78 | return client; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
79 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
80 | |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
81 | void http_client_free(HttpClient *client) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
82 | cxMempoolFree(client->mp); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
83 | header_array_free(client->request_headers); |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
84 | http_parser_free(client->parser); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
85 | free(client->buffer.inbuf); |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
86 | free(client->addr); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
87 | free(client->method); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
88 | free(client->uri); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
89 | free(client); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
90 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
91 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
92 | int http_client_set_addr(HttpClient *client, const struct sockaddr *addr, socklen_t addrlen) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
93 | free(client->addr); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
94 | client->addr = NULL; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
95 | client->addrlen = 0; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
96 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
97 | void *newaddr = malloc(addrlen); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
98 | if(!newaddr) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
99 | return 1; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
100 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
101 | memcpy(newaddr, addr, addrlen); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
102 | client->addr = newaddr; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
103 | client->addrlen = addrlen; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
104 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
105 | return 0; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
106 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
107 | |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
108 | 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
|
109 | 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
|
110 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
111 | |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
112 | 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
|
113 | 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
|
114 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
115 | |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
116 | 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
|
117 | free(*ptr); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
118 | if(str) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
119 | char *newvalue = malloc(len+1); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
120 | if(!newvalue) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
121 | *ptr = NULL; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
122 | return 1; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
123 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
124 | memcpy(newvalue, str, len); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
125 | newvalue[len] = 0; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
126 | *ptr = newvalue; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
127 | } else { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
128 | *ptr = NULL; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
129 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
130 | return 0; |
|
669
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_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
|
134 | return client_set_str(&client->method, method, len); |
|
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 | 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
|
138 | return client_set_str(&client->uri, uri, len); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
139 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
140 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
141 | 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
|
142 | 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
|
143 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
144 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
145 | 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
|
146 | 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
|
147 | 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
|
148 | 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
|
149 | 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
|
150 | } |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
151 | } |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
152 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
153 | 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
|
154 | 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
|
155 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
156 | int err = 1; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
157 | if(n.ptr && v.ptr) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
158 | 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
|
159 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
160 | if(err) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
161 | cxFree(client->mp->allocator, n.ptr); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
162 | cxFree(client->mp->allocator, v.ptr); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
163 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
164 | return err; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
165 | } |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
166 | |
|
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 | 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
|
168 | 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
|
169 | 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
|
170 | 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
|
171 | 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
|
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 | |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
174 | 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
|
175 | 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
|
176 | 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
|
177 | } |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
178 | |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
179 | int http_client_start(HttpClient *client) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
180 | int socketfd = socket(AF_INET, SOCK_STREAM, 0); |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
181 | if(socketfd < 0) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
182 | return 1; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
183 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
184 | |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
185 | if(util_socket_setnonblock(socketfd, 1)) { |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
186 | close(socketfd); |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
187 | return 1; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
188 | } |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
189 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
190 | client->socketfd = socketfd; |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
191 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
192 | client->writeev.cookie = client; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
193 | client->writeev.fn = client_connected; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
194 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
195 | int ret = 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
196 | if(connect(socketfd, client->addr, client->addrlen)) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
197 | int err = errno; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
198 | if(err == EINPROGRESS) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
199 | ret = ev_pollout(client->ev, socketfd, &client->writeev); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
200 | } else { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
201 | 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
|
202 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
203 | } else { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
204 | // TODO: call client_connected directly |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
205 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
206 | |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
207 | if(ret) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
208 | close(socketfd); |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
209 | } |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
210 | return ret; |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
211 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
212 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
213 | static int create_req_buffer(HttpClient *client) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
214 | 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
|
215 | 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
|
216 | return 1; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
217 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
218 | |
|
668
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
219 | if(client->method) { |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
220 | cxBufferPutString(&buf, "GET "); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
221 | } else { |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
222 | cxBufferPutString(&buf, client->method); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
223 | } |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
224 | cxBufferPutString(&buf, client->uri ? client->uri : "/"); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
225 | 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
|
226 | |
|
668
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
227 | HeaderArray *hdr = client->request_headers; |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
228 | while(hdr) { |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
229 | 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
|
230 | cxBufferPutString(&buf, hdr->headers[i].name); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
231 | cxBufferPutString(&buf, ": "); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
232 | cxBufferPutString(&buf, hdr->headers[i].value); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
233 | cxBufferPutString(&buf, "\r\n"); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
234 | } |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
235 | hdr = hdr->next; |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
236 | } |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
237 | cxBufferPutString(&buf, "\r\n"); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
238 | client->req_buffer = buf.space; |
|
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
|
239 | client->req_buffer_alloc = buf.capacity; |
|
668
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
240 | client->req_buffer_len = buf.size; |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
241 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
242 | return 0; |
|
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 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
245 | 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
|
246 | HttpClient *client = event->cookie; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
247 | if(create_req_buffer(client)) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
248 | // TODO: set error |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
249 | return 0; // end |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
250 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
251 | event->fn = client_io; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
252 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
253 | return client_io(ev, event); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
254 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
255 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
256 | static int client_io(EventHandler *ev, Event *event) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
257 | HttpClient *client = event->cookie; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
258 | if(client->req_buffer_pos < client->req_buffer_len) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
259 | if(client_send_request(client)) { |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
260 | return client->error == 0; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
261 | } |
|
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
|
262 | } |
|
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
|
263 | |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
264 | // do we need to send a request body? |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
265 | if(client->req_content_length != 0) { |
|
679
4885cd4c3754
httpclient: move code for sending the request body to a separate function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
676
diff
changeset
|
266 | if(client_send_request_body(client)) { |
|
4885cd4c3754
httpclient: move code for sending the request body to a separate function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
676
diff
changeset
|
267 | return client->error == 0; |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
268 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
269 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
270 | |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
271 | // writing complete, switch to read events |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
272 | event->events = EVENT_POLLIN; |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
273 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
274 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
275 | char *buffer; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
276 | size_t nbytes; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
277 | if(client->header_complete) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
278 | buffer = client->buffer.inbuf; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
279 | nbytes = client->buffer.maxsize; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
280 | } else { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
281 | buffer = client->buffer.inbuf + client->buffer.pos; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
282 | nbytes = client->buffer.maxsize - client->buffer.cursize; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
283 | } |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
284 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
285 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
286 | ssize_t r; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
287 | while((r = read(client->socketfd, buffer, nbytes)) > 0) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
288 | client->buffer.cursize += r; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
289 | if(!client->header_complete) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
290 | switch(http_parser_process(client->parser)) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
291 | case 0: { // finish |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
292 | if(!http_parser_validate(client->parser)) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
293 | client->error = 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
294 | return 0; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
295 | } |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
296 | client->statuscode = client->parser->status; |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
297 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
298 | client->header_complete = 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
299 | if(client->response_start) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
300 | cxmutstr msg = client->parser->msg; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
301 | char t = msg.ptr[msg.length]; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
302 | msg.ptr[msg.length] = 0; |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
303 | int ret = client->response_start(client, client->statuscode, msg.ptr, client->response_start_userdata); |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
304 | msg.ptr[msg.length] = t; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
305 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
306 | // TODO: check ret |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
307 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
308 | break; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
309 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
310 | case 1: { // need more data |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
311 | continue; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
312 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
313 | case 2: { // error |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
314 | client->error = 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
315 | return 0; |
|
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 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
319 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
320 | // header complete |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
321 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
322 | char *out = client->buffer.inbuf + client->buffer.pos; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
323 | size_t len = client->buffer.cursize - client->buffer.pos; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
324 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
325 | if(client->response_body_write) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
326 | int ret = client->response_body_write(client, out, len, client->response_body_write_userdata); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
327 | // TODO: check ret |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
328 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
329 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
330 | client->buffer.pos = 0; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
331 | client->buffer.cursize = 0; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
332 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
333 | |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
334 | if(r < 0) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
335 | if(errno == EAGAIN) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
336 | return 1; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
337 | } else { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
338 | log_ereport(LOG_FAILURE, "http-client: IO error: %s", strerror(errno)); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
339 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
340 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
341 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
342 | // request finished |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
343 | if(client->response_finished) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
344 | client->response_finished(client, client->response_finished_userdata); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
345 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
346 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
347 | return 0; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
348 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
349 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
350 | static int client_finished(EventHandler *ev, Event *event) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
351 | HttpClient *client = event->cookie; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
352 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
353 | close(client->socketfd); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
354 | client->socketfd = -1; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
355 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
356 | // request finished |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
357 | if(client->response_finished) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
358 | client->response_finished(client, client->response_finished_userdata); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
359 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
360 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
361 | return 0; |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
362 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
363 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
364 | static int client_send_request(HttpClient *client) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
365 | size_t nbytes = client->req_buffer_len - client->req_buffer_pos; |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
366 | ssize_t w; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
367 | while((w = write(client->socketfd, client->req_buffer + client->req_buffer_pos, 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
|
368 | client->req_buffer_pos += w; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
369 | nbytes = client->req_buffer_len - client->req_buffer_pos; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
370 | 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
|
371 | 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
|
372 | } |
|
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
|
373 | } |
|
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
|
374 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
375 | if(w <= 0) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
376 | if(errno != EAGAIN) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
377 | // TODO: log correct host |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
378 | log_ereport(LOG_VERBOSE, "http-client %s - %s: write failed: %s", "localhost", client->uri, strerror(errno)); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
379 | client->error = 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
380 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
381 | return 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
382 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
383 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
384 | return client->req_buffer_pos < client->req_buffer_len; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
385 | } |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
386 | |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
387 | static int client_send_request_body(HttpClient *client) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
388 | size_t rbody_readsize = client->req_buffer_alloc; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
389 | 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
|
390 | 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
|
391 | // chunked transfer encoding: |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
392 | // 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
|
393 | // 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
|
394 | rbody_readsize -= 16; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
395 | 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
|
396 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
397 | while(!client->request_body_complete) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
398 | ssize_t r = client->request_body_read(client, client->req_buffer + rbody_buf_offset, rbody_readsize, client->request_body_read_userdata); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
399 | if(r <= 0) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
400 | 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
|
401 | return 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
402 | } 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
|
403 | // EOF |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
404 | 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
|
405 | break; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
406 | } else { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
407 | // error |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
408 | client->error = 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
409 | return 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
410 | } |
|
681
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
411 | } 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
|
412 | // 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
|
413 | // 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
|
414 | // the request body is complete and we can add the termination chunk |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
415 | char *r2buf = client->req_buffer + rbody_buf_offset + r; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
416 | 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
|
417 | if(r > 0) { |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
418 | r += r2; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
419 | } 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
|
420 | 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
|
421 | r += 5; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
422 | 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
|
423 | 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
|
424 | } 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
|
425 | return 1; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
426 | } else { |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
427 | client->error = 1; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
428 | return 1; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
429 | } |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
430 | } |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
431 | |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
432 | 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
|
433 | 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
|
434 | char chunkheader[16]; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
435 | 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
|
436 | startpos = 16 - chunkheaderlen; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
437 | memcpy(client->req_buffer + startpos, chunkheader, chunkheaderlen); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
438 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
439 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
440 | client->req_contentlength_pos += r; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
441 | client->req_buffer_pos = startpos; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
442 | client->req_buffer_len = rbody_buf_offset + r; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
443 | if(client_send_request(client)) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
444 | return 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
445 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
446 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
447 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
448 | // 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
|
449 | if(client->req_content_length == -1 && !client->request_body_terminated) { |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
450 | memcpy(client->req_buffer, "0\r\n\r\n", 5); |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
451 | client->req_buffer_pos = 0; |
|
681
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
452 | client->req_buffer_len = 5; |
|
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
453 | client->request_body_terminated = 1; |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
454 | if(client_send_request(client)) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
455 | return 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
456 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
457 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
458 | } 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
|
459 | // incomplete request body |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
460 | client->error = 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
461 | return 1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
462 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
463 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
464 | return 0; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
465 | } |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
466 | |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
467 | /* --------------------------------- Tests --------------------------------- */ |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
468 | |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
469 | static CX_TEST(test_http_client_send_request) { |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
470 | CX_TEST_DO { |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
471 | EventHandler dummy; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
472 | HttpClient *client = http_client_new(&dummy); |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
473 | |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
474 | int fds[2]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
475 | util_socketpair(fds); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
476 | util_socket_setnonblock(fds[0], 1); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
477 | util_socket_setnonblock(fds[1], 1); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
478 | client->socketfd = fds[0]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
479 | int sock = fds[1]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
480 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
481 | // 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
|
482 | // 32mb should be enough |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
483 | size_t len = 32*1024*1024; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
484 | char *str = malloc(len); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
485 | // init the buffer with random data |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
486 | 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
|
487 | int *p = (int*)(str+i); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
488 | *p = rand();; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
489 | } |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
490 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
491 | client->req_buffer = str; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
492 | client->req_buffer_len = len; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
493 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
494 | // test client_send_request |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
495 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
496 | int ret = client_send_request(client); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
497 | // 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
|
498 | // 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
|
499 | // 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
|
500 | CX_TEST_ASSERT(ret == 1 && !client->error); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
501 | CX_TEST_ASSERT(client->req_buffer_pos > 0); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
502 | CX_TEST_ASSERT(client->req_buffer_pos < len); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
503 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
504 | // 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
|
505 | CxBuffer buf; |
|
676
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
506 | 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
|
507 | char tmpbuf[1024]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
508 | int writes = 1; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
509 | while(client->req_buffer_pos < client->req_buffer_len && writes < 2000000) { |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
510 | ssize_t r = read(sock, tmpbuf, 1024); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
511 | CX_TEST_ASSERT(r >= 0); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
512 | cxBufferWrite(tmpbuf, 1, r, &buf); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
513 | ret = client_send_request(client); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
514 | 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
|
515 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
516 | writes++; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
517 | } |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
518 | CX_TEST_ASSERT(client->req_buffer_pos == client->req_buffer_len); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
519 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
520 | // finish reading the request buffer from sock |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
521 | ssize_t r; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
522 | 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
|
523 | cxBufferWrite(tmpbuf, 1, r, &buf); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
524 | writes++; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
525 | } |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
526 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
527 | CX_TEST_ASSERT(buf.size == len); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
528 | 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
|
529 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
530 | // cleanup |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
531 | close(fds[0]); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
532 | close(fds[1]); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
533 | http_client_free(client); |
|
676
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
534 | cxBufferDestroy(&buf); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
535 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
536 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
537 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
538 | typedef struct TestResponse { |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
539 | int status; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
540 | char *msg; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
541 | CxBuffer *response; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
542 | } TestResponse; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
543 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
544 | 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
|
545 | TestResponse *test = userdata; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
546 | test->status = status; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
547 | test->msg = strdup(msg); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
548 | return 0; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
549 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
550 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
551 | 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
|
552 | TestResponse *test = userdata; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
553 | cxBufferWrite(buf, 1, size, test->response); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
554 | return size; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
555 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
556 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
557 | static CX_TEST(test_http_client_io_simple) { |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
558 | CX_TEST_DO { |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
559 | EventHandler dummy; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
560 | HttpClient *client = http_client_new(&dummy); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
561 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
562 | int fds[2]; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
563 | util_socketpair(fds); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
564 | util_socket_setnonblock(fds[0], 1); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
565 | util_socket_setnonblock(fds[1], 1); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
566 | client->socketfd = fds[0]; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
567 | int sock = fds[1]; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
568 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
569 | // setup client |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
570 | http_client_set_uri(client, "/test/uri/"); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
571 | http_client_set_method(client, "GET"); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
572 | http_client_add_request_header(client, cx_mutstr("Host"), cx_mutstr("localhost")); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
573 | http_client_add_request_header(client, cx_mutstr("Test1"), cx_mutstr("value1")); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
574 | http_client_add_request_header(client, cx_mutstr("Test2"), cx_mutstr("value2")); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
575 | create_req_buffer(client); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
576 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
577 | size_t req_header_len = client->req_buffer_len; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
578 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
579 | // response buffer |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
580 | CxBuffer buf; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
581 | cxBufferInit(&buf, cxDefaultAllocator, NULL, 1024, CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
582 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
583 | TestResponse testr = { 0 }; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
584 | testr.response = &buf; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
585 | client->response_start = test_response_start; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
586 | client->response_start_userdata = &testr; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
587 | client->response_body_write = test_response_body_write; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
588 | client->response_body_write_userdata = &testr; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
589 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
590 | // test IO |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
591 | Event event; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
592 | event.cookie = client; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
593 | int ret = client_io(&dummy, &event); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
594 | CX_TEST_ASSERT(!client->error); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
595 | CX_TEST_ASSERT(ret == 1); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
596 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
597 | // do IO and read request until the header is processed |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
598 | size_t req_header_pos = 0; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
599 | char req_buf[4]; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
600 | while(req_header_pos < req_header_len) { |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
601 | ssize_t r = read(sock, req_buf, 4); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
602 | if(r == 0) { |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
603 | break; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
604 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
605 | CX_TEST_ASSERT(r > 0); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
606 | req_header_pos += r; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
607 | ret = client_io(&dummy, &event); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
608 | CX_TEST_ASSERT(!client->error); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
609 | CX_TEST_ASSERT(ret == 1); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
610 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
611 | CX_TEST_ASSERT(req_header_pos == req_header_len); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
612 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
613 | char *response_str = |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
614 | "HTTP/1.1 200 OK\r\n" |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
615 | "Host: localhost\r\n" |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
616 | "Content-length: 13\r\n" |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
617 | "\r\n" |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
618 | "Hello World!\n"; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
619 | size_t response_str_len = strlen(response_str); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
620 | size_t response_str_pos = 0; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
621 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
622 | // send response and do IO |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
623 | while(response_str_pos < response_str_len) { |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
624 | size_t len = response_str_len - response_str_pos; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
625 | if(len > 3) { |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
626 | //len = 3; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
627 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
628 | ssize_t w = write(sock, response_str + response_str_pos, len); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
629 | if(w == 0) { |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
630 | break; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
631 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
632 | CX_TEST_ASSERT(w > 0); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
633 | response_str_pos += w; |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
634 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
635 | ret = client_io(&dummy, &event); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
636 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
637 | CX_TEST_ASSERT(!client->error); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
638 | CX_TEST_ASSERT(ret == 1); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
639 | } |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
640 | CX_TEST_ASSERT(response_str_pos == response_str_len); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
641 | CX_TEST_ASSERT(testr.status == 200); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
642 | CX_TEST_ASSERT(testr.msg); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
643 | CX_TEST_ASSERT(!strcmp(testr.msg, "OK")); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
644 | CX_TEST_ASSERT(testr.response->size == 13); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
645 | CX_TEST_ASSERT(!cx_strcmp(cx_strn(testr.response->space, testr.response->size), "Hello World!\n")); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
646 | |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
647 | // cleanup |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
648 | free(testr.msg); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
649 | close(fds[0]); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
650 | close(fds[1]); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
651 | http_client_free(client); |
|
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
652 | cxBufferDestroy(&buf); |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
653 | } |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
654 | } |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
655 | |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
656 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
657 | typedef struct TestRequestBody { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
658 | char *content; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
659 | size_t length; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
660 | size_t pos; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
661 | int chunksize; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
662 | 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
|
663 | 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
|
664 | } TestRequestBody; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
665 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
666 | 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
|
667 | TestRequestBody *req = userdata; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
668 | req->cur_reads++; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
669 | 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
|
670 | return -1; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
671 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
672 | 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
|
673 | if(max == 0) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
674 | return 0; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
675 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
676 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
677 | 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
|
678 | if(sz > max) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
679 | sz = max; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
680 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
681 | 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
|
682 | req->pos += sz; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
683 | return sz; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
684 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
685 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
686 | 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
|
687 | CX_TEST_DO { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
688 | EventHandler dummy; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
689 | 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
|
690 | 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
|
691 | 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
|
692 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
693 | int fds[2]; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
694 | util_socketpair(fds); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
695 | 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
|
696 | 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
|
697 | 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
|
698 | 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
|
699 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
700 | // response buffer |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
701 | CxBuffer buf; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
702 | 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
|
703 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
704 | // test |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
705 | 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
|
706 | 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
|
707 | 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
|
708 | 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
|
709 | 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
|
710 | 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
|
711 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
712 | TestRequestBody req; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
713 | 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
|
714 | req.length = 1024; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
715 | req.pos = 0; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
716 | req.chunksize = 16; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
717 | 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
|
718 | 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
|
719 | 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
|
720 | 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
|
721 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
722 | memset(client->req_buffer, '_', client->req_buffer_alloc); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
723 | client->req_buffer_pos = 0; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
724 | client->req_buffer_len = 0; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
725 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
726 | // 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
|
727 | 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
|
728 | 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
|
729 | 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
|
730 | 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
|
731 | char buf2[1024]; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
732 | 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
|
733 | if(r > 0) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
734 | 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
|
735 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
736 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
737 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
738 | // 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
|
739 | // (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
|
740 | 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
|
741 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
742 | // 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
|
743 | 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
|
744 | req.chunksize = 128; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
745 | 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
|
746 | 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
|
747 | 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
|
748 | char buf2[2048]; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
749 | ssize_t r; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
750 | 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
|
751 | 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
|
752 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
753 | if(ret == 0) { |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
754 | break; |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
755 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
756 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
757 | CX_TEST_ASSERT(req.cur_reads < req.max_reads); |
|
681
e9705d51866a
optimize chunked transfer encoding termination in client_send_request_body
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
758 | //CX_TEST_ASSERT(buf.size == 1084 + 5); |
|
680
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
759 | |
|
682
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
760 | // verify chunks |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
761 | 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
|
762 | 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
|
763 | |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
764 | int pos = 0; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
765 | int chunklen = 0; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
766 | 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
|
767 | 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
|
768 | 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
|
769 | 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
|
770 | chunkheader.length = 1; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
771 | } |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
772 | 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
|
773 | 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
|
774 | if(chunklen == 0) { |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
775 | break; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
776 | } |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
777 | |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
778 | char *data = str + 4; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
779 | 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
|
780 | pos += chunklen; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
781 | str = data + chunklen; |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
782 | } |
|
f4c593a99266
verify chunks in test_http_client_send_request_body_chunked
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
783 | 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
|
784 | |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
785 | // cleanup |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
786 | close(fds[0]); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
787 | close(fds[1]); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
788 | 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
|
789 | cxBufferDestroy(&buf); |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
790 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
791 | } |
|
02935baa186b
httpclient: add support for chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
792 | |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
793 | void http_client_add_tests(CxTestSuite *suite) { |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
794 | 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
|
795 | cx_test_register(suite, test_http_client_send_request_body_chunked); |
|
676
d43f1dd8b18e
add test_http_client_io_simple
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
796 | cx_test_register(suite, test_http_client_io_simple); |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
797 | } |