Changes with Apache 2.0.40
+ *) Switch conn_rec->keepalive to an enumeration rather than a bitfield.
+ [Justin Erenkrantz]
+
*) Fix mod_ext_filter to look in the main server for filter definitions
when running in a vhost if the filter definition is not found in
the vhost. PR 10147 [Jeff Trawick]
* 20020529 (2.0.37-dev) Standardized the names of some apr_pool_*_set funcs
* 20020602 (2.0.37-dev) Bucket API change (metadata buckets)
* 20020612 (2.0.38-dev) Changed server_rec->[keep_alive_]timeout to apr time
+ * 20020625 (2.0.40-dev) Changed conn_rec->keepalive to an enumeration
*/
#define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */
#ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20020612
+#define MODULE_MAGIC_NUMBER_MAJOR 20020625
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
/* @} */
+typedef enum {
+ AP_CONN_UNKNOWN,
+ AP_CONN_CLOSE,
+ AP_CONN_KEEPALIVE
+} ap_conn_keepalive_e;
/** Structure to store things which are per connection */
struct conn_rec {
unsigned aborted:1;
/** Are we going to keep the connection alive for another request?
- * -1 fatal error, 0 undecided, 1 yes */
- signed int keepalive:2;
+ * @see ap_conn_keepalive_e */
+ ap_conn_keepalive_e keepalive;
/** have we done double-reverse DNS? -1 yes/failure, 0 not yet,
* 1 yes/success */
return 0;
case HSE_REQ_IS_KEEP_CONN:
- *((int *)buf_data) = (r->connection->keepalive == 1);
+ *((int *)buf_data) = (r->connection->keepalive == AP_CONN_KEEPALIVE);
return 1;
case HSE_REQ_ASYNC_READ_CLIENT:
ap_update_child_status(c->sbh, SERVER_BUSY_READ, NULL);
while ((r = ap_read_request(c)) != NULL) {
- c->keepalive = 0;
+ c->keepalive = AP_CONN_UNKNOWN;
/* process the request if it was read without error */
ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r);
if (ap_extended_status)
ap_increment_counts(c->sbh, r);
- if (!c->keepalive || c->aborted)
+ if (c->keepalive != AP_CONN_KEEPALIVE || c->aborted)
break;
ap_update_child_status(c->sbh, SERVER_BUSY_KEEPALIVE, r);
*
* Note that the condition evaluation order is extremely important.
*/
- if ((r->connection->keepalive != -1)
+ if ((r->connection->keepalive != AP_CONN_CLOSE)
&& ((r->status == HTTP_NOT_MODIFIED)
|| (r->status == HTTP_NO_CONTENT)
|| r->header_only
|| (r->proto_num >= HTTP_VERSION(1,1)))) {
int left = r->server->keep_alive_max - r->connection->keepalives;
- r->connection->keepalive = 1;
+ r->connection->keepalive = AP_CONN_KEEPALIVE;
r->connection->keepalives++;
/* If they sent a Keep-Alive token, send one back */
apr_table_mergen(r->headers_out, "Connection", "close");
}
- r->connection->keepalive = 0;
+ r->connection->keepalive = AP_CONN_CLOSE;
return 0;
}
if (r->proto_num == HTTP_VERSION(1,0)
&& apr_table_get(r->subprocess_env, "force-response-1.0")) {
*protocol = "HTTP/1.0";
- r->connection->keepalive = -1;
+ r->connection->keepalive = AP_CONN_CLOSE;
}
else {
*protocol = AP_SERVER_PROTOCOL;
/* if we actually fail here, we want to just return and
* stop trying to read data from the client.
*/
- r->connection->keepalive = -1;
+ r->connection->keepalive = AP_CONN_CLOSE;
return -1;
}
*
* This function is also a no-op on a subrequest.
*/
- if (r->main || !r->connection->keepalive
- || ap_status_drops_connection(r->status)) {
+ if (r->main || r->connection->keepalive == AP_CONN_CLOSE ||
+ ap_status_drops_connection(r->status)) {
return OK;
}
* connection, be sure that the request body (if any) has been read.
*/
if (ap_status_drops_connection(r->status)) {
- r->connection->keepalive = 0;
+ r->connection->keepalive = AP_CONN_CLOSE;
}
/*
*/
/* ### shouldn't this read from the connection input filters? */
/* ### is zero correct? that means "read one line" */
- if (!r->connection->keepalive ||
+ if (r->connection->keepalive == AP_CONN_CLOSE ||
ap_get_brigade(r->input_filters, bb, AP_MODE_EATCRLF,
APR_NONBLOCK_READ, 0) != APR_SUCCESS) {
apr_bucket *e = apr_bucket_flush_create(c->bucket_alloc);
if (r->connection->aborted)
return "X";
- if (r->connection->keepalive &&
+ if (r->connection->keepalive == AP_CONN_KEEPALIVE &&
(!r->server->keep_alive_max ||
(r->server->keep_alive_max - r->connection->keepalives) > 0)) {
return "+";
ap_proxy_clear_connection(p, r->headers_in);
if (p_conn->close) {
apr_table_setn(r->headers_in, "Connection", "close");
- origin->keepalive = 0;
+ origin->keepalive = AP_CONN_CLOSE;
}
if ( apr_table_get(r->subprocess_env,"force-proxy-request-1.0")) {
}
if ( apr_table_get(r->subprocess_env,"proxy-nokeepalive")) {
apr_table_unset(r->headers_in, "Connection");
- origin->keepalive = 0;
+ origin->keepalive = AP_CONN_CLOSE;
}
ap_xlate_proto_to_ascii(buf, strlen(buf));
e = apr_bucket_pool_create(buf, strlen(buf), p, c->bucket_alloc);
/* cancel keepalive if HTTP/1.0 or less */
if ((major < 1) || (minor < 1)) {
p_conn->close += 1;
- origin->keepalive = 0;
+ origin->keepalive = AP_CONN_CLOSE;
}
} else {
/* an http/0.9 response */
ap_input_mode_t mode, apr_read_type_e block,
apr_off_t readbytes)
{
- int keptalive = f->c->keepalive == 1;
+ int keptalive = f->c->keepalive == AP_CONN_KEEPALIVE;
apr_socket_t *csd = ap_get_module_config(f->c->conn_config, &core_module);
int *first_line = f->ctx;
&& (nbytes + flen < AP_MIN_BYTES_TO_WRITE)
&& !APR_BUCKET_IS_FLUSH(last_e))
|| (nbytes + flen < AP_MIN_BYTES_TO_WRITE
- && APR_BUCKET_IS_EOS(last_e) && c->keepalive)) {
+ && APR_BUCKET_IS_EOS(last_e)
+ && c->keepalive == AP_CONN_KEEPALIVE)) {
/* NEVER save an EOS in here. If we are saving a brigade with
* an EOS bucket, then we are doing keepalive connections, and
}
#if APR_HAS_SENDFILE
- if (!c->keepalive && APR_BUCKET_IS_EOS(last_e)) {
+ if (c->keepalive == AP_CONN_CLOSE && APR_BUCKET_IS_EOS(last_e)) {
/* Prepare the socket to be reused */
flags |= APR_SENDFILE_DISCONNECT_SOCKET;
}
* We should be able to force connection close from this filter
* when we see we are buffering too much.
*/
- if ((r->proto_num >= HTTP_VERSION(1, 1)) || (!r->connection->keepalive)) {
+ if ((r->proto_num >= HTTP_VERSION(1, 1)) ||
+ (r->connection->keepalive == AP_CONN_CLOSE)) {
partial_send_okay = 1;
}