aboutsummaryrefslogtreecommitdiff
path: root/src/microhttpd/connection.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/microhttpd/connection.c')
-rw-r--r--src/microhttpd/connection.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 5f310c8e..aa7734ab 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -2210,7 +2210,8 @@ setup_reply_properties (struct MHD_Connection *connection)
2210 c->rp.props.use_reply_body_headers = (use_rp_body >= RP_BODY_HEADERS_ONLY); 2210 c->rp.props.use_reply_body_headers = (use_rp_body >= RP_BODY_HEADERS_ONLY);
2211 2211
2212#ifdef UPGRADE_SUPPORT 2212#ifdef UPGRADE_SUPPORT
2213 mhd_assert ((NULL == r->upgrade_handler) || (RP_BODY_NONE == use_rp_body)); 2213 mhd_assert ( (NULL == r->upgrade_handler) ||
2214 (RP_BODY_NONE == use_rp_body) );
2214#endif /* UPGRADE_SUPPORT */ 2215#endif /* UPGRADE_SUPPORT */
2215 2216
2216 if (c->rp.props.use_reply_body_headers) 2217 if (c->rp.props.use_reply_body_headers)
@@ -2237,7 +2238,8 @@ setup_reply_properties (struct MHD_Connection *connection)
2237 else 2238 else
2238 use_chunked = false; 2239 use_chunked = false;
2239 2240
2240 if ( (MHD_SIZE_UNKNOWN == r->total_size) && ! use_chunked) 2241 if ( (MHD_SIZE_UNKNOWN == r->total_size) &&
2242 (! use_chunked) )
2241 { 2243 {
2242 /* End of the stream is indicated by closure */ 2244 /* End of the stream is indicated by closure */
2243 c->keepalive = MHD_CONN_MUST_CLOSE; 2245 c->keepalive = MHD_CONN_MUST_CLOSE;
@@ -2262,10 +2264,11 @@ check_connection_reply (struct MHD_Connection *connection)
2262{ 2264{
2263 struct MHD_Connection *const c = connection; /**< a short alias */ 2265 struct MHD_Connection *const c = connection; /**< a short alias */
2264 struct MHD_Response *const r = c->rp.response; /**< a short alias */ 2266 struct MHD_Response *const r = c->rp.response; /**< a short alias */
2265 mhd_assert (c->rp.props.set);
2266 2267
2268 mhd_assert (c->rp.props.set);
2267#ifdef HAVE_MESSAGES 2269#ifdef HAVE_MESSAGES
2268 if ((! c->rp.props.use_reply_body_headers) && (0 != r->total_size)) 2270 if ( (! c->rp.props.use_reply_body_headers) &&
2271 (0 != r->total_size) )
2269 { 2272 {
2270 MHD_DLOG (c->daemon, 2273 MHD_DLOG (c->daemon,
2271 _ ("This reply with response code %u cannot use reply body. " 2274 _ ("This reply with response code %u cannot use reply body. "
@@ -2477,7 +2480,6 @@ build_header_response (struct MHD_Connection *connection)
2477 mhd_assert (NULL != r); 2480 mhd_assert (NULL != r);
2478 2481
2479 /* ** Adjust response properties ** */ 2482 /* ** Adjust response properties ** */
2480
2481 setup_reply_properties (c); 2483 setup_reply_properties (c);
2482 2484
2483 mhd_assert (c->rp.props.set); 2485 mhd_assert (c->rp.props.set);