BODY_CHUNK_END_LF, /* got CR after data, expect LF */
BODY_CHUNK_TRAILER /* trailers */
} state;
- unsigned int eos_sent :1;
+ unsigned int at_eos:1,
+ seen_data:1;
} http_ctx_t;
/**
r->status = saved_status;
e = apr_bucket_eos_create(f->c->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(b, e);
- ctx->eos_sent = 1;
+ ctx->at_eos = 1;
rv = APR_SUCCESS;
}
else {
* proxied *response*, proxy responses MUST be exempt.
*/
if (ctx->state == BODY_NONE && f->r->proxyreq != PROXYREQ_RESPONSE) {
- e = apr_bucket_eos_create(f->c->bucket_alloc);
- APR_BRIGADE_INSERT_TAIL(b, e);
- ctx->eos_sent = 1;
- return APR_SUCCESS;
+ ctx->at_eos = 1; /* send EOS below */
}
+ }
+ {
/* Since we're about to read data, send 100-Continue if needed.
- * Only valid on chunked and C-L bodies where the C-L is > 0. */
- if ((ctx->state == BODY_CHUNK
- || (ctx->state == BODY_LENGTH && ctx->remaining > 0))
+ * Only valid on chunked and C-L bodies where the C-L is > 0.
+ *
+ * If the read is to be nonblocking though, the caller may not want to
+ * handle this just now (e.g. mod_proxy_http), and is prepared to read
+ * nothing if the client really waits for 100 continue, so we don't
+ * send it now and wait for later blocking read.
+ *
+ * In any case, even if r->expecting remains set at the end of the
+ * request handling, ap_set_keepalive() will finally do the right
+ * thing (i.e. "Connection: close" the connection).
+ */
+ if (block == APR_BLOCK_READ
+ && (ctx->state == BODY_CHUNK
+ || (ctx->state == BODY_LENGTH && ctx->remaining > 0))
&& f->r->expecting_100 && f->r->proto_num >= HTTP_VERSION(1,1)
- && !(f->r->eos_sent || f->r->bytes_sent)) {
+ && !(ctx->at_eos || f->r->eos_sent || f->r->bytes_sent)) {
if (!ap_is_HTTP_SUCCESS(f->r->status)) {
ctx->state = BODY_NONE;
- ctx->eos_sent = 1;
+ ctx->at_eos = 1; /* send EOS below */
+ }
+ else if (!ctx->seen_data) {
+ int saved_status = f->r->status;
+ f->r->status = HTTP_CONTINUE;
+ ap_send_interim_response(f->r, 0);
+ AP_DEBUG_ASSERT(!f->r->expecting_100);
+ f->r->status = saved_status;
}
else {
- char *tmp;
- int len;
- apr_bucket_brigade *bb;
-
- bb = apr_brigade_create(f->r->pool, f->c->bucket_alloc);
-
- /* if we send an interim response, we're no longer
- * in a state of expecting one.
+ /* https://tools.ietf.org/html/rfc7231#section-5.1.1
+ * A server MAY omit sending a 100 (Continue) response if it
+ * has already received some or all of the message body for
+ * the corresponding request [...]
*/
f->r->expecting_100 = 0;
- tmp = apr_pstrcat(f->r->pool, AP_SERVER_PROTOCOL " ",
- ap_get_status_line(HTTP_CONTINUE), CRLF CRLF, NULL);
- len = strlen(tmp);
- ap_xlate_proto_to_ascii(tmp, len);
- e = apr_bucket_pool_create(tmp, len, f->r->pool,
- f->c->bucket_alloc);
- APR_BRIGADE_INSERT_HEAD(bb, e);
- e = apr_bucket_flush_create(f->c->bucket_alloc);
- APR_BRIGADE_INSERT_TAIL(bb, e);
-
- rv = ap_pass_brigade(f->c->output_filters, bb);
- if (rv != APR_SUCCESS) {
- return AP_FILTER_ERROR;
- }
}
}
}
/* sanity check in case we're read twice */
- if (ctx->eos_sent) {
+ if (ctx->at_eos) {
e = apr_bucket_eos_create(f->c->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(b, e);
return APR_SUCCESS;
if (!APR_BUCKET_IS_METADATA(e)) {
rv = apr_bucket_read(e, &buffer, &len, APR_BLOCK_READ);
-
if (rv == APR_SUCCESS) {
+ if (len > 0) {
+ ctx->seen_data = 1;
+ }
rv = parse_chunk_size(ctx, buffer, len,
f->r->server->limit_req_fieldsize, strict);
}
/* How many bytes did we just read? */
apr_brigade_length(b, 0, &totalread);
+ if (totalread > 0) {
+ ctx->seen_data = 1;
+ }
/* If this happens, we have a bucket of unknown length. Die because
* it means our assumptions have changed. */
if (ctx->state == BODY_LENGTH && ctx->remaining == 0) {
e = apr_bucket_eos_create(f->c->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(b, e);
- ctx->eos_sent = 1;
+ ctx->at_eos = 1;
}
break;
apr_interval_time_t idle_timeout;
unsigned int can_go_async :1,
- expecting_100 :1,
do_100_continue :1,
prefetch_nonblocking :1,
force10 :1;
apr_file_t *tmpfile = NULL;
apr_off_t limit;
- /* Send "100 Continue" now if the client expects one, before
- * blocking on the body, otherwise we'd wait for each other.
- */
- if (req->expecting_100) {
- int saved_status = r->status;
-
- r->expecting_100 = 1;
- r->status = HTTP_CONTINUE;
- ap_send_interim_response(r, 0);
- AP_DEBUG_ASSERT(!r->expecting_100);
-
- r->status = saved_status;
- req->expecting_100 = 0;
- }
-
body_brigade = apr_brigade_create(p, bucket_alloc);
*bytes_spooled = 0;
apr_read_type_e block;
int rv;
- if (req->force10 && req->expecting_100) {
+ if (req->force10 && r->expecting_100) {
return HTTP_EXPECTATION_FAILED;
}
apr_brigade_length(temp_brigade, 1, &bytes);
bytes_read += bytes;
- /* From https://tools.ietf.org/html/rfc7231#section-5.1.1
- * A server MAY omit sending a 100 (Continue) response if it has
- * already received some or all of the message body for the
- * corresponding request, or if [snip].
- */
- if (req->expecting_100 && bytes > 0) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, status, r, APLOGNO(10206)
- "prefetching request body while 100-continue is"
- "expected, omit sending interim response");
- req->expecting_100 = 0;
- }
-
/*
* Save temp_brigade in input_brigade. (At least) in the SSL case
* temp_brigade contains transient buckets whose data would get
*
* So let's make it configurable.
*
- * We need to set "r->expecting_100 = 1" otherwise origin
- * server behaviour will apply.
+ * We need to force "r->expecting_100 = 1" for RFC behaviour
+ * otherwise ap_send_interim_response() does nothing when
+ * the client did not ask for 100-continue.
*
* 101 Switching Protocol has its own configuration which
* shouldn't be interfered by "proxy-interim-response".
if (!policy
|| (!strcasecmp(policy, "RFC")
&& (proxy_status != HTTP_CONTINUE
- || (req->expecting_100 = 1)))) {
+ || (r->expecting_100 = 1)))) {
switch (proxy_status) {
- case HTTP_CONTINUE:
- r->expecting_100 = req->expecting_100;
- req->expecting_100 = 0;
- break;
case HTTP_SWITCHING_PROTOCOLS:
AP_DEBUG_ASSERT(upgrade != NULL);
apr_table_setn(r->headers_out, "Connection", "Upgrade");
* here though, because error_override or a potential retry on
* another backend could finally read that data and finalize
* the request processing, making keep-alive possible. So what
- * we do is restoring r->expecting_100 for ap_set_keepalive()
- * to do the right thing according to the final response and
+ * we do is leaving r->expecting_100 alone, ap_set_keepalive()
+ * will do the right thing according to the final response and
* any later update of r->expecting_100.
*/
- r->expecting_100 = req->expecting_100;
- req->expecting_100 = 0;
}
/* Once only! */
/* If we didn't send the full body yet, do it now */
if (do_100_continue) {
- req->expecting_100 = 0;
+ r->expecting_100 = 0;
status = send_continue_body(req);
if (status != OK) {
return status;
/* Should we handle end-to-end or ping 100-continue? */
if ((r->expecting_100 && (dconf->forward_100_continue || input_brigade))
|| PROXY_DO_100_CONTINUE(worker, r)) {
- /* We need to reset r->expecting_100 or prefetching will cause
- * ap_http_filter() to send "100 Continue" response by itself. So
- * we'll use req->expecting_100 in mod_proxy_http to determine whether
- * the client should be forwarded "100 continue", and r->expecting_100
- * will be restored at the end of the function with the actual value of
- * req->expecting_100 (i.e. cleared only if mod_proxy_http sent the
- * "100 Continue" according to its policy).
- */
req->do_100_continue = 1;
- req->expecting_100 = (r->expecting_100 != 0);
- r->expecting_100 = 0;
}
/* Should we block while prefetching the body or try nonblocking and flush
ap_proxy_release_connection(proxy_function, req->backend,
r->server);
}
- if (req->expecting_100) {
- /* Restore r->expecting_100 if we didn't touch it */
- r->expecting_100 = req->expecting_100;
- }
return status;
}
projects / thirdparty / apache / httpd.git / commitdiff
