www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Revert r1756064 and r1756060 until fixed (tests framework passes).

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756065 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2016-08-11 23:37:45 +00:00
parent 25b8c2b589
commit 104ef73c95
8 changed files with 87 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/ap_mmn.h
View File

@@ -532,11 +532,10 @@
* dav_success_proppatch. * dav_success_proppatch.
* 20160608.4 (2.5.0-dev) Add dav_acl_provider, dav_acl_provider_register * 20160608.4 (2.5.0-dev) Add dav_acl_provider, dav_acl_provider_register
* dav_get_acl_providers. * dav_get_acl_providers.
* 20160608.5 (2.5.0-dev) Add ap_proxy_check_connection(), and tmp_bb to * 20160608.5 (2.5.0-dev) Add ap_proxy_check_backend(), and tmp_bb to struct
* struct proxy_conn_rec. * proxy_conn_rec.
* 20160608.6 (2.5.0-dev) Add ap_scan_http_field_content, ap_scan_http_token * 20160608.6 (2.5.0-dev) Add ap_scan_http_field_content, ap_scan_http_token
* and ap_get_http_token * and ap_get_http_token
* 20160608.7 (2.5.0-dev) Add ap_check_pipeline().
*/ */
#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@@ -544,7 +543,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR #ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20160608 #define MODULE_MAGIC_NUMBER_MAJOR 20160608
#endif #endif
#define MODULE_MAGIC_NUMBER_MINOR 7 /* 0...n */ #define MODULE_MAGIC_NUMBER_MINOR 6 /* 0...n */
/** /**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

15
include/http_request.h
View File

@@ -350,21 +350,6 @@ void ap_process_async_request(request_rec *r);
*/ */
AP_DECLARE(void) ap_die(int type, request_rec *r); AP_DECLARE(void) ap_die(int type, request_rec *r);
/**
* Check whether a connection is still established and has data available,
* optionnaly consuming blank lines ([CR]LF).
* @param c The current connection
* @param bb The brigade to filter
* @param max_blank_lines Max number of blank lines to consume, or zero
* to consider them as data (single read).
* @return APR_SUCCESS: connection ready and empty,
* APR_ENOTEMPTY: connection ready with data available,
* APR_NOTFOUND: too much blank lines,
* APR_E*: connection/general error.
*/
AP_DECLARE(apr_status_t) ap_check_pipeline(conn_rec *c, apr_bucket_brigade *bb,
unsigned int max_blank_lines);
/* Hooks */ /* Hooks */
/** /**

74
modules/http/http_request.c
View File

@@ -229,45 +229,41 @@ AP_DECLARE(void) ap_die(int type, request_rec *r)
ap_die_r(type, r, r->status); ap_die_r(type, r, r->status);
} }
AP_DECLARE(apr_status_t) ap_check_pipeline(conn_rec *c, apr_bucket_brigade *bb, static void check_pipeline(conn_rec *c, apr_bucket_brigade *bb)
unsigned int max_blank_lines)
{ {
apr_status_t rv = APR_EOF; apr_status_t rv;
int num_blank_lines = DEFAULT_LIMIT_BLANK_LINES;
ap_input_mode_t mode = AP_MODE_SPECULATIVE; ap_input_mode_t mode = AP_MODE_SPECULATIVE;
unsigned int num_blank_lines = 0;
apr_size_t cr = 0; apr_size_t cr = 0;
char buf[2]; char buf[2];
c->data_in_input_filters = 0;
while (c->keepalive != AP_CONN_CLOSE && !c->aborted) { while (c->keepalive != AP_CONN_CLOSE && !c->aborted) {
apr_size_t len = cr + 1; apr_size_t len = cr + 1;
apr_brigade_cleanup(bb); apr_brigade_cleanup(bb);
rv = ap_get_brigade(c->input_filters, bb, mode, rv = ap_get_brigade(c->input_filters, bb, mode,
APR_NONBLOCK_READ, len); APR_NONBLOCK_READ, len);
if (rv != APR_SUCCESS || APR_BRIGADE_EMPTY(bb) || !max_blank_lines) { if (rv != APR_SUCCESS || APR_BRIGADE_EMPTY(bb)) {
/*
* Error or empty brigade: There is no data present in the input
* filter
*/
if (mode == AP_MODE_READBYTES) { if (mode == AP_MODE_READBYTES) {
/* Unexpected error, stop with this connection */ /* Unexpected error, stop with this connection */
ap_log_cerror(APLOG_MARK, APLOG_ERR, rv, c, APLOGNO(02967) ap_log_cerror(APLOG_MARK, APLOG_ERR, rv, c, APLOGNO(02967)
"Can't consume pipelined empty lines"); "Can't consume pipelined empty lines");
c->keepalive = AP_CONN_CLOSE; c->keepalive = AP_CONN_CLOSE;
rv = APR_EGENERAL;
}
else if (rv == APR_SUCCESS && !APR_BRIGADE_EMPTY(bb)) {
/* Single read asked, data available */
rv = APR_ENOTEMPTY;
}
else if (APR_STATUS_IS_EAGAIN(rv)) {
/* Pipe is empty and ready */
rv = APR_SUCCESS;
}
else {
/* Pipe is dead, rv up to date */
c->keepalive = AP_CONN_CLOSE;
} }
break; break;
} }
/* Lookup and consume blank lines */ /* Ignore trailing blank lines (which must not be interpreted as
* pipelined requests) up to the limit, otherwise we would block
* on the next read without flushing data, and hence possibly delay
* pending response(s) until the next/real request comes in or the
* keepalive timeout expires.
*/
rv = apr_brigade_flatten(bb, buf, &len); rv = apr_brigade_flatten(bb, buf, &len);
if (rv != APR_SUCCESS || len != cr + 1) { if (rv != APR_SUCCESS || len != cr + 1) {
int log_level; int log_level;
@@ -275,17 +271,14 @@ AP_DECLARE(apr_status_t) ap_check_pipeline(conn_rec *c, apr_bucket_brigade *bb,
/* Unexpected error, stop with this connection */ /* Unexpected error, stop with this connection */
c->keepalive = AP_CONN_CLOSE; c->keepalive = AP_CONN_CLOSE;
log_level = APLOG_ERR; log_level = APLOG_ERR;
if (rv == APR_SUCCESS) {
rv = APR_EGENERAL;
}
} }
else { else {
/* Let outside (non-speculative/blocking) read determine /* Let outside (non-speculative/blocking) read determine
* where this possible failure comes from (metadata, * where this possible failure comes from (metadata,
* morphed EOF socket => empty bucket? debug only here). * morphed EOF socket => empty bucket? debug only here).
*/ */
c->data_in_input_filters = 1;
log_level = APLOG_DEBUG; log_level = APLOG_DEBUG;
rv = APR_ENOTEMPTY;
} }
ap_log_cerror(APLOG_MARK, log_level, rv, c, APLOGNO(02968) ap_log_cerror(APLOG_MARK, log_level, rv, c, APLOGNO(02968)
"Can't check pipelined data"); "Can't check pipelined data");
@@ -293,49 +286,40 @@ AP_DECLARE(apr_status_t) ap_check_pipeline(conn_rec *c, apr_bucket_brigade *bb,
} }
if (mode == AP_MODE_READBYTES) { if (mode == AP_MODE_READBYTES) {
/* [CR]LF consumed, try next */
mode = AP_MODE_SPECULATIVE; mode = AP_MODE_SPECULATIVE;
cr = 0; cr = 0;
} }
else if (cr) { else if (cr) {
AP_DEBUG_ASSERT(len == 2 && buf[0] == APR_ASCII_CR); AP_DEBUG_ASSERT(len == 2 && buf[0] == APR_ASCII_CR);
if (buf[1] == APR_ASCII_LF) { if (buf[1] == APR_ASCII_LF) {
/* consume this CRLF */
mode = AP_MODE_READBYTES; mode = AP_MODE_READBYTES;
num_blank_lines++; num_blank_lines--;
} }
else { else {
/* CR(?!LF) is data */ c->data_in_input_filters = 1;
rv = APR_ENOTEMPTY;
break; break;
} }
} }
else { else {
if (buf[0] == APR_ASCII_LF) { if (buf[0] == APR_ASCII_LF) {
/* consume this LF */
mode = AP_MODE_READBYTES; mode = AP_MODE_READBYTES;
num_blank_lines++; num_blank_lines--;
} }
else if (buf[0] == APR_ASCII_CR) { else if (buf[0] == APR_ASCII_CR) {
cr = 1; cr = 1;
} }
else { else {
/* Not [CR]LF, some data */ c->data_in_input_filters = 1;
rv = APR_ENOTEMPTY;
break; break;
} }
} }
if (num_blank_lines > max_blank_lines) { /* Enough blank lines with this connection?
/* Enough blank lines with this connection, * Stop and don't recycle it.
* stop and don't recycle it. */
*/ if (num_blank_lines < 0) {
c->keepalive = AP_CONN_CLOSE; c->keepalive = AP_CONN_CLOSE;
rv = APR_NOTFOUND;
break;
} }
} }
return rv;
} }
@@ -344,7 +328,6 @@ AP_DECLARE(void) ap_process_request_after_handler(request_rec *r)
apr_bucket_brigade *bb; apr_bucket_brigade *bb;
apr_bucket *b; apr_bucket *b;
conn_rec *c = r->connection; conn_rec *c = r->connection;
apr_status_t rv;
/* Send an EOR bucket through the output filter chain. When /* Send an EOR bucket through the output filter chain. When
* this bucket is destroyed, the request will be logged and * this bucket is destroyed, the request will be logged and
@@ -377,15 +360,8 @@ AP_DECLARE(void) ap_process_request_after_handler(request_rec *r)
* already by the EOR bucket's cleanup function. * already by the EOR bucket's cleanup function.
*/ */
/* Check pipeline consuming blank lines, they must not be interpreted as check_pipeline(c, bb);
* the next pipelined request, otherwise we would block on the next read
* without flushing data, and hence possibly delay pending response(s)
* until the next/real request comes in or the keepalive timeout expires.
*/
rv = ap_check_pipeline(c, bb, DEFAULT_LIMIT_BLANK_LINES);
c->data_in_input_filters = (rv == APR_ENOTEMPTY);
apr_brigade_destroy(bb); apr_brigade_destroy(bb);
if (c->cs) if (c->cs)
c->cs->state = (c->aborted) ? CONN_STATE_LINGER c->cs->state = (c->aborted) ? CONN_STATE_LINGER
: CONN_STATE_WRITE_COMPLETION; : CONN_STATE_WRITE_COMPLETION;

33
modules/proxy/mod_proxy.h
View File

@@ -671,7 +671,7 @@ PROXY_DECLARE(int) ap_proxy_checkproxyblock(request_rec *r, proxy_server_conf *c
PROXY_DECLARE(int) ap_proxy_pre_http_request(conn_rec *c, request_rec *r); PROXY_DECLARE(int) ap_proxy_pre_http_request(conn_rec *c, request_rec *r);
/* DEPRECATED (will be replaced with ap_proxy_connect_backend */ /* DEPRECATED (will be replaced with ap_proxy_connect_backend */
PROXY_DECLARE(int) ap_proxy_connect_to_backend(apr_socket_t **, const char *, apr_sockaddr_t *, const char *, proxy_server_conf *, request_rec *); PROXY_DECLARE(int) ap_proxy_connect_to_backend(apr_socket_t **, const char *, apr_sockaddr_t *, const char *, proxy_server_conf *, request_rec *);
/* DEPRECATED (will be replaced with ap_proxy_check_connection */ /* DEPRECATED (will be replaced with ap_proxy_check_backend */
PROXY_DECLARE(apr_status_t) ap_proxy_ssl_connection_cleanup(proxy_conn_rec *conn, PROXY_DECLARE(apr_status_t) ap_proxy_ssl_connection_cleanup(proxy_conn_rec *conn,
request_rec *r); request_rec *r);
PROXY_DECLARE(int) ap_proxy_ssl_enable(conn_rec *c); PROXY_DECLARE(int) ap_proxy_ssl_enable(conn_rec *c);
@@ -977,27 +977,22 @@ PROXY_DECLARE(int) ap_proxy_acquire_connection(const char *proxy_function,
PROXY_DECLARE(int) ap_proxy_release_connection(const char *proxy_function, PROXY_DECLARE(int) ap_proxy_release_connection(const char *proxy_function,
proxy_conn_rec *conn, proxy_conn_rec *conn,
server_rec *s); server_rec *s);
#define PROXY_CHECK_CONN_EMPTY (1 << 0)
/** /**
* Check a connection to the backend * Check a connection to the backend
* @param scheme calling proxy scheme (http, ajp, ...) * @param proxy_function calling proxy scheme (http, ajp, ...)
* @param conn acquired connection * @param conn acquired connection
* @param server current server record * @param s current server record
* @param max_blank_lines how many blank lines to consume, * @param expect_empty whether to check for empty (no data available) or not
* or zero for none (considered data) * @return APR_SUCCESS or,
* @param flags PROXY_CHECK_* bitmask * APR_ENOTSOCK: not connected,
* @return APR_SUCCESS: connection ready and empty, * APR_NOTFOUND: worker in error state (unusable),
* APR_ENOTEMPTY: connection ready and has data, * APR_ENOTEMPTY: expect_empty set but the connection has data,
* APR_ENOSOCKET: not connected, * other: connection closed/aborted (remotely)
* APR_EINVAL: worker in error state (unusable),
* other: connection closed/aborted (remotely)
*/ */
PROXY_DECLARE(apr_status_t) ap_proxy_check_connection(const char *scheme, PROXY_DECLARE(apr_status_t) ap_proxy_check_backend(const char *proxy_function,
proxy_conn_rec *conn, proxy_conn_rec *conn,
server_rec *server, server_rec *s,
unsigned max_blank_lines, int expect_empty);
int flags);
/** /**
* Make a connection to the backend * Make a connection to the backend

6
modules/proxy/mod_proxy_ajp.c
View File

@@ -783,10 +783,8 @@ static int proxy_ajp_handler(request_rec *r, proxy_worker *worker,
break; break;
/* Step Two: Make the Connection */ /* Step Two: Make the Connection */
if (ap_proxy_check_connection(scheme, backend, r->server, 0, if (ap_proxy_check_backend(scheme, backend, r->server, 1) &&
PROXY_CHECK_CONN_EMPTY) ap_proxy_connect_backend(scheme, backend, worker, r->server)) {
&& ap_proxy_connect_backend(scheme, backend, worker,
r->server)) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00896) ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00896)
"failed to make connection to backend: %s", "failed to make connection to backend: %s",
backend->hostname); backend->hostname);

28
modules/proxy/mod_proxy_fcgi.c
View File

@@ -928,16 +928,6 @@ static int proxy_fcgi_handler(request_rec *r, proxy_worker *worker,
backend->is_ssl = 0; backend->is_ssl = 0;
/* This scheme handler does not reuse connections by default, to
* avoid tying up a fastcgi that isn't expecting to work on
* parallel requests. But if the user went out of their way to
* type the default value of disablereuse=off, we'll allow it.
*/
backend->close = 1;
if (worker->s->disablereuse_set && !worker->s->disablereuse) {
backend->close = 0;
}
/* Step One: Determine Who To Connect To */ /* Step One: Determine Who To Connect To */
uri = apr_palloc(p, sizeof(*uri)); uri = apr_palloc(p, sizeof(*uri));
status = ap_proxy_determine_connection(p, r, conf, worker, backend, status = ap_proxy_determine_connection(p, r, conf, worker, backend,
@@ -948,11 +938,21 @@ static int proxy_fcgi_handler(request_rec *r, proxy_worker *worker,
goto cleanup; goto cleanup;
} }
/* This scheme handler does not reuse connections by default, to
* avoid tying up a fastcgi that isn't expecting to work on
* parallel requests. But if the user went out of their way to
* type the default value of disablereuse=off, we'll allow it.
*/
backend->close = 1;
if (worker->s->disablereuse_set && !worker->s->disablereuse) {
backend->close = 0;
}
/* Step Two: Make the Connection */ /* Step Two: Make the Connection */
if (ap_proxy_check_connection(FCGI_SCHEME, backend, r->server, 0, if ((backend->close || ap_proxy_check_backend(FCGI_SCHEME, backend,
PROXY_CHECK_CONN_EMPTY) r->server, 1)) &&
&& ap_proxy_connect_backend(FCGI_SCHEME, backend, worker, ap_proxy_connect_backend(FCGI_SCHEME, backend, worker,
r->server)) { r->server)) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01079) ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01079)
"failed to make connection to backend: %s", "failed to make connection to backend: %s",
backend->hostname); backend->hostname);

7
modules/proxy/mod_proxy_http.c
View File

@@ -2068,10 +2068,9 @@ static int proxy_http_handler(request_rec *r, proxy_worker *worker,
} }
/* Step Two: Make the Connection */ /* Step Two: Make the Connection */
if (ap_proxy_check_connection(proxy_function, backend, r->server, 1, if (ap_proxy_check_backend(proxy_function, backend, r->server, 1) &&
PROXY_CHECK_CONN_EMPTY) ap_proxy_connect_backend(proxy_function, backend, worker,
&& ap_proxy_connect_backend(proxy_function, backend, worker, r->server)) {
r->server)) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01114) ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01114)
"HTTP: failed to make connection to backend: %s", "HTTP: failed to make connection to backend: %s",
backend->hostname); backend->hostname);

44
modules/proxy/proxy_util.c
View File

@@ -2699,11 +2699,10 @@ PROXY_DECLARE(apr_status_t) ap_proxy_connect_uds(apr_socket_t *sock,
#endif #endif
} }
PROXY_DECLARE(apr_status_t) ap_proxy_check_connection(const char *scheme, PROXY_DECLARE(apr_status_t) ap_proxy_check_backend(const char *proxy_function,
proxy_conn_rec *conn, proxy_conn_rec *conn,
server_rec *server, server_rec *s,
unsigned max_blank_lines, int expect_empty)
int flags)
{ {
apr_status_t rv = APR_SUCCESS; apr_status_t rv = APR_SUCCESS;
proxy_worker *worker = conn->worker; proxy_worker *worker = conn->worker;
@@ -2714,17 +2713,25 @@ PROXY_DECLARE(apr_status_t) ap_proxy_check_connection(const char *scheme,
* e.g. for a timeout or bad status. We should respect this and should * e.g. for a timeout or bad status. We should respect this and should
* not continue with a connection via this worker even if we got one. * not continue with a connection via this worker even if we got one.
*/ */
rv = APR_EINVAL; rv = APR_NOTFOUND;
} }
else if (!conn->sock) { else if (!conn->sock) {
rv = APR_ENOSOCKET; rv = APR_ENOTSOCK;
} }
else if (conn->connection) { else if (conn->connection) {
rv = ap_check_pipeline(conn->connection, conn->tmp_bb, conn_rec *c = conn->connection;
max_blank_lines); rv = ap_get_brigade(c->input_filters, conn->tmp_bb,
if (rv == APR_ENOTEMPTY && !(flags & PROXY_CHECK_CONN_EMPTY)) { AP_MODE_SPECULATIVE, APR_NONBLOCK_READ, 1);
if (APR_STATUS_IS_EAGAIN(rv)) {
rv = APR_SUCCESS; rv = APR_SUCCESS;
} }
else if (rv == APR_SUCCESS && expect_empty) {
apr_off_t len = 0;
apr_brigade_length(conn->tmp_bb, 0, &len);
if (len) {
rv = APR_ENOTEMPTY;
}
}
apr_brigade_cleanup(conn->tmp_bb); apr_brigade_cleanup(conn->tmp_bb);
} }
else if (!ap_proxy_is_socket_connected(conn->sock)) { else if (!ap_proxy_is_socket_connected(conn->sock)) {
@@ -2737,7 +2744,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_check_connection(const char *scheme,
* ap_proxy_determine_connection(). * ap_proxy_determine_connection().
*/ */
char ssl_hostname[PROXY_WORKER_RFC1035_NAME_SIZE]; char ssl_hostname[PROXY_WORKER_RFC1035_NAME_SIZE];
if (rv == APR_EINVAL if (rv == APR_NOTFOUND
|| !conn->ssl_hostname || !conn->ssl_hostname
|| PROXY_STRNCPY(ssl_hostname, conn->ssl_hostname)) { || PROXY_STRNCPY(ssl_hostname, conn->ssl_hostname)) {
ssl_hostname[0] = '\0'; ssl_hostname[0] = '\0';
@@ -2745,13 +2752,14 @@ PROXY_DECLARE(apr_status_t) ap_proxy_check_connection(const char *scheme,
socket_cleanup(conn); socket_cleanup(conn);
if (rv != APR_ENOTEMPTY) { if (rv != APR_ENOTEMPTY) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, server, APLOGNO(00951) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00951)
"%s: backend socket is disconnected.", scheme); "%s: backend socket is disconnected.",
proxy_function);
} }
else { else {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, server, APLOGNO(03408) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(03408)
"%s: reusable backend connection is not empty: " "%s: reusable backend connection is not empty: "
"forcibly closed", scheme); "forcibly closed", proxy_function);
} }
if (ssl_hostname[0]) { if (ssl_hostname[0]) {
@@ -2777,8 +2785,8 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
proxy_server_conf *conf = proxy_server_conf *conf =
(proxy_server_conf *) ap_get_module_config(sconf, &proxy_module); (proxy_server_conf *) ap_get_module_config(sconf, &proxy_module);
rv = ap_proxy_check_connection(proxy_function, conn, s, 0, 0); rv = ap_proxy_check_backend(proxy_function, conn, s, 0);
if (rv == APR_EINVAL) { if (rv == APR_NOTFOUND) {
return DECLINED; return DECLINED;
} }
@@ -2994,7 +3002,7 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
if (rv == APR_SUCCESS) { if (rv == APR_SUCCESS) {
socket_cleanup(conn); socket_cleanup(conn);
} }
rv = APR_EINVAL; rv = APR_NOTFOUND;
} }
return rv == APR_SUCCESS ? OK : DECLINED; return rv == APR_SUCCESS ? OK : DECLINED;