From f38e046a0a2e7437f8232ef2a99cead69c4b9ebb Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 16 Jul 2004 17:11:43 +0000 Subject: nginx-0.0.7-2004-07-16-21:11:43 import --- src/http/modules/ngx_http_ssl_filter.c | 150 ----------------------- src/http/modules/ngx_http_ssl_filter.h | 30 ----- src/http/modules/ngx_http_ssl_module.c | 153 ++++++++++++++++++++++++ src/http/modules/ngx_http_ssl_module.h | 30 +++++ src/http/modules/proxy/ngx_http_proxy_handler.h | 2 +- src/http/ngx_http.h | 4 +- src/http/ngx_http_config.h | 7 +- src/http/ngx_http_core_module.c | 7 +- src/http/ngx_http_core_module.h | 3 - src/http/ngx_http_request.c | 88 ++++++++++++-- src/http/ngx_http_request.h | 7 +- src/http/ngx_http_write_filter.c | 19 +-- 12 files changed, 294 insertions(+), 206 deletions(-) delete mode 100644 src/http/modules/ngx_http_ssl_filter.c delete mode 100644 src/http/modules/ngx_http_ssl_filter.h create mode 100644 src/http/modules/ngx_http_ssl_module.c create mode 100644 src/http/modules/ngx_http_ssl_module.h (limited to 'src/http') diff --git a/src/http/modules/ngx_http_ssl_filter.c b/src/http/modules/ngx_http_ssl_filter.c deleted file mode 100644 index 1d370be2d..000000000 --- a/src/http/modules/ngx_http_ssl_filter.c +++ /dev/null @@ -1,150 +0,0 @@ - -#include -#include -#include - - -#define NGX_DEFLAUT_CERTIFICATE "cert.pem" -#define NGX_DEFLAUT_CERTIFICATE_KEY "cert.pem" - - -static void *ngx_http_ssl_create_srv_conf(ngx_conf_t *cf); -static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, - void *parent, void *child); -static ngx_int_t ngx_http_ssl_init_process(ngx_cycle_t *cycle); - - -static ngx_command_t ngx_http_charset_filter_commands[] = { - - { ngx_string("ssl"), - NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, - ngx_conf_set_flag_slot, - NGX_HTTP_SRV_CONF_OFFSET, - offsetof(ngx_http_ssl_srv_conf_t, enable), - NULL }, - - { ngx_string("ssl_certificate"), - NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, - ngx_conf_set_str_slot, - NGX_HTTP_SRV_CONF_OFFSET, - offsetof(ngx_http_ssl_srv_conf_t, certificate), - NULL }, - - { ngx_string("ssl_certificate_key"), - NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, - ngx_conf_set_str_slot, - NGX_HTTP_SRV_CONF_OFFSET, - offsetof(ngx_http_ssl_srv_conf_t, certificate_key), - NULL }, - - ngx_null_command -}; - - -static ngx_http_module_t ngx_http_ssl_filter_module_ctx = { - NULL, /* pre conf */ - - NULL, /* create main configuration */ - NULL, /* init main configuration */ - - ngx_http_ssl_create_srv_conf, /* create server configuration */ - ngx_http_ssl_merge_srv_conf, /* merge server configuration */ - - NULL, /* create location configuration */ - NULL, /* merge location configuration */ -}; - - -ngx_module_t ngx_http_ssl_filter_module = { - NGX_MODULE, - &ngx_http_ssl_filter_module_ctx, /* module context */ - ngx_http_charset_filter_commands, /* module directives */ - NGX_HTTP_MODULE, /* module type */ - NULL, /* init module */ - ngx_http_ssl_init_process /* init process */ -}; - - -static void *ngx_http_ssl_create_srv_conf(ngx_conf_t *cf) -{ - ngx_http_ssl_srv_conf_t *scf; - - if (!(scf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssl_srv_conf_t)))) { - return NGX_CONF_ERROR; - } - - scf->enable = NGX_CONF_UNSET; - - return scf; -} - - -static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, - void *parent, void *child) -{ - ngx_http_ssl_srv_conf_t *prev = parent; - ngx_http_ssl_srv_conf_t *conf = child; - - ngx_conf_merge_value(conf->enable, prev->enable, 0); - - if (conf->enable == 0) { - return NGX_CONF_OK; - } - - ngx_conf_merge_str_value(conf->certificate, prev->certificate, - NGX_DEFLAUT_CERTIFICATE); - - ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, - NGX_DEFLAUT_CERTIFICATE_KEY); - - /* TODO: configure methods */ - - conf->ssl_ctx = SSL_CTX_new(SSLv23_server_method()); - - if (conf->ssl_ctx == NULL) { - ngx_ssl_error(NGX_LOG_EMERG, cf->log, "SSL_CTX_new() failed"); - return NGX_CONF_ERROR; - } - - if (SSL_CTX_use_certificate_file(conf->ssl_ctx, conf->certificate.data, - SSL_FILETYPE_PEM) == 0) { - ngx_ssl_error(NGX_LOG_EMERG, cf->log, - "SSL_CTX_use_certificate_file(\"%s\") failed", - conf->certificate.data); - return NGX_CONF_ERROR; - } - - if (SSL_CTX_use_PrivateKey_file(conf->ssl_ctx, conf->certificate_key.data, - SSL_FILETYPE_PEM) == 0) { - ngx_ssl_error(NGX_LOG_EMERG, cf->log, - "SSL_CTX_use_PrivateKey_file(\"%s\") failed", - conf->certificate_key.data); - return NGX_CONF_ERROR; - } - - return NGX_CONF_OK; -} - - -static ngx_int_t ngx_http_ssl_init_process(ngx_cycle_t *cycle) -{ - ngx_uint_t i; - ngx_http_ssl_srv_conf_t *sscf; - ngx_http_core_srv_conf_t **cscfp; - ngx_http_core_main_conf_t *cmcf; - - cmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_core_module); - - cscfp = cmcf->servers.elts; - - for (i = 0; i < cmcf->servers.nelts; i++) { - sscf = cscfp[i]->ctx->srv_conf[ngx_http_ssl_filter_module.ctx_index]; - - if (sscf->enable) { - cscfp[i]->recv = ngx_ssl_recv; - cscfp[i]->send_chain = ngx_ssl_send_chain; - } - } - - return NGX_OK; -} diff --git a/src/http/modules/ngx_http_ssl_filter.h b/src/http/modules/ngx_http_ssl_filter.h deleted file mode 100644 index a42ee9135..000000000 --- a/src/http/modules/ngx_http_ssl_filter.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef _NGX_HTTP_SSL_FILTER_H_INCLUDED_ -#define _NGX_HTTP_SSL_FILTER_H_INCLUDED_ - - -#include -#include -#include - - -typedef struct { - ngx_flag_t enable; - ngx_str_t certificate; - ngx_str_t certificate_key; - - ngx_ssl_ctx_t *ssl_ctx; -} ngx_http_ssl_srv_conf_t; - - -ngx_int_t ngx_http_ssl_read(ngx_http_request_t *r, u_char *buf, size_t size); -ngx_int_t ngx_http_ssl_shutdown(ngx_http_request_t *r); -ngx_chain_t *ngx_http_ssl_write(ngx_connection_t *c, ngx_chain_t *in, - off_t limit); - -void ngx_http_ssl_close_connection(SSL *ssl, ngx_log_t *log); - - -extern ngx_module_t ngx_http_ssl_filter_module; - - -#endif /* _NGX_HTTP_SSL_FILTER_H_INCLUDED_ */ diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c new file mode 100644 index 000000000..3a8b863a2 --- /dev/null +++ b/src/http/modules/ngx_http_ssl_module.c @@ -0,0 +1,153 @@ + +#include +#include +#include + + +#define NGX_DEFLAUT_CERTIFICATE "cert.pem" +#define NGX_DEFLAUT_CERTIFICATE_KEY "cert.pem" + + +static void *ngx_http_ssl_create_srv_conf(ngx_conf_t *cf); +static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, + void *parent, void *child); + + +static ngx_command_t ngx_http_ssl_commands[] = { + + { ngx_string("ssl"), + NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, + ngx_conf_set_flag_slot, + NGX_HTTP_SRV_CONF_OFFSET, + offsetof(ngx_http_ssl_srv_conf_t, enable), + NULL }, + + { ngx_string("ssl_certificate"), + NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, + ngx_conf_set_str_slot, + NGX_HTTP_SRV_CONF_OFFSET, + offsetof(ngx_http_ssl_srv_conf_t, certificate), + NULL }, + + { ngx_string("ssl_certificate_key"), + NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, + ngx_conf_set_str_slot, + NGX_HTTP_SRV_CONF_OFFSET, + offsetof(ngx_http_ssl_srv_conf_t, certificate_key), + NULL }, + + ngx_null_command +}; + + +static ngx_http_module_t ngx_http_ssl_module_ctx = { + NULL, /* pre conf */ + + NULL, /* create main configuration */ + NULL, /* init main configuration */ + + ngx_http_ssl_create_srv_conf, /* create server configuration */ + ngx_http_ssl_merge_srv_conf, /* merge server configuration */ + + NULL, /* create location configuration */ + NULL, /* merge location configuration */ +}; + + +ngx_module_t ngx_http_ssl_module = { + NGX_MODULE, + &ngx_http_ssl_module_ctx, /* module context */ + ngx_http_ssl_commands, /* module directives */ + NGX_HTTP_MODULE, /* module type */ + NULL, /* init module */ + NULL /* init process */ +}; + + +static void *ngx_http_ssl_create_srv_conf(ngx_conf_t *cf) +{ + ngx_http_ssl_srv_conf_t *scf; + + if (!(scf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssl_srv_conf_t)))) { + return NGX_CONF_ERROR; + } + + scf->enable = NGX_CONF_UNSET; + + return scf; +} + + +static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, + void *parent, void *child) +{ + ngx_http_ssl_srv_conf_t *prev = parent; + ngx_http_ssl_srv_conf_t *conf = child; + + ngx_conf_merge_value(conf->enable, prev->enable, 0); + + if (conf->enable == 0) { + return NGX_CONF_OK; + } + + ngx_conf_merge_str_value(conf->certificate, prev->certificate, + NGX_DEFLAUT_CERTIFICATE); + + ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, + NGX_DEFLAUT_CERTIFICATE_KEY); + + /* TODO: configure methods */ + + conf->ssl_ctx = SSL_CTX_new(SSLv23_server_method()); + + if (conf->ssl_ctx == NULL) { + ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0, "SSL_CTX_new() failed"); + return NGX_CONF_ERROR; + } + + if (SSL_CTX_use_certificate_file(conf->ssl_ctx, conf->certificate.data, + SSL_FILETYPE_PEM) == 0) { + ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0, + "SSL_CTX_use_certificate_file(\"%s\") failed", + conf->certificate.data); + return NGX_CONF_ERROR; + } + + if (SSL_CTX_use_PrivateKey_file(conf->ssl_ctx, conf->certificate_key.data, + SSL_FILETYPE_PEM) == 0) { + ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0, + "SSL_CTX_use_PrivateKey_file(\"%s\") failed", + conf->certificate_key.data); + return NGX_CONF_ERROR; + } + + return NGX_CONF_OK; +} + + +#if 0 + +static ngx_int_t ngx_http_ssl_init_process(ngx_cycle_t *cycle) +{ + ngx_uint_t i; + ngx_http_ssl_srv_conf_t *sscf; + ngx_http_core_srv_conf_t **cscfp; + ngx_http_core_main_conf_t *cmcf; + + cmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_core_module); + + cscfp = cmcf->servers.elts; + + for (i = 0; i < cmcf->servers.nelts; i++) { + sscf = cscfp[i]->ctx->srv_conf[ngx_http_ssl_module.ctx_index]; + + if (sscf->enable) { + cscfp[i]->recv = ngx_ssl_recv; + cscfp[i]->send_chain = ngx_ssl_send_chain; + } + } + + return NGX_OK; +} + +#endif diff --git a/src/http/modules/ngx_http_ssl_module.h b/src/http/modules/ngx_http_ssl_module.h new file mode 100644 index 000000000..2bb1fe1fe --- /dev/null +++ b/src/http/modules/ngx_http_ssl_module.h @@ -0,0 +1,30 @@ +#ifndef _NGX_HTTP_SSL_H_INCLUDED_ +#define _NGX_HTTP_SSL_H_INCLUDED_ + + +#include +#include +#include + + +typedef struct { + ngx_flag_t enable; + ngx_str_t certificate; + ngx_str_t certificate_key; + + ngx_ssl_ctx_t *ssl_ctx; +} ngx_http_ssl_srv_conf_t; + + +ngx_int_t ngx_http_ssl_read(ngx_http_request_t *r, u_char *buf, size_t size); +ngx_int_t ngx_http_ssl_shutdown(ngx_http_request_t *r); +ngx_chain_t *ngx_http_ssl_write(ngx_connection_t *c, ngx_chain_t *in, + off_t limit); + +void ngx_http_ssl_close_connection(SSL *ssl, ngx_log_t *log); + + +extern ngx_module_t ngx_http_ssl_module; + + +#endif /* _NGX_HTTP_SSL_H_INCLUDED_ */ diff --git a/src/http/modules/proxy/ngx_http_proxy_handler.h b/src/http/modules/proxy/ngx_http_proxy_handler.h index c89e971dc..fa8698231 100644 --- a/src/http/modules/proxy/ngx_http_proxy_handler.h +++ b/src/http/modules/proxy/ngx_http_proxy_handler.h @@ -203,7 +203,7 @@ typedef struct { } ngx_http_proxy_log_ctx_t; -#define NGX_HTTP_PROXY_PARSE_NO_HEADER 20 +#define NGX_HTTP_PROXY_PARSE_NO_HEADER 30 #define NGX_HTTP_PROXY_FT_ERROR 0x02 diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h index 44edd1529..145082fa0 100644 --- a/src/http/ngx_http.h +++ b/src/http/ngx_http.h @@ -21,8 +21,8 @@ typedef struct ngx_http_cleanup_s ngx_http_cleanup_t; #include #include -#if (NGX_OPENSSL) -#include +#if (NGX_HTTP_SSL) +#include #endif diff --git a/src/http/ngx_http_config.h b/src/http/ngx_http_config.h index 647566aab..d2fb8a9ff 100644 --- a/src/http/ngx_http_config.h +++ b/src/http/ngx_http_config.h @@ -45,8 +45,11 @@ typedef struct { #define ngx_http_conf_get_module_main_conf(cf, module) \ ((ngx_http_conf_ctx_t *) cf->ctx)->main_conf[module.ctx_index] -#define ngx_http_conf_get_module_srv_conf(cf, module) \ - ngx_http_conf_get_module_srv_conf_could_not_be_implemented() +/* + * ngx_http_conf_get_module_srv_conf() and ngx_http_conf_get_module_loc_conf() + * could not be correctly implemented because at the merge phase cf->ctx + * points to http{}'s ctx + */ #define ngx_http_cycle_get_module_main_conf(cycle, module) \ ((ngx_http_conf_ctx_t *) \ diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index dc6e8736b..911a5aaeb 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -18,7 +18,6 @@ static void *ngx_http_core_create_loc_conf(ngx_conf_t *cf); static char *ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child); -static ngx_int_t ngx_http_core_init_process(ngx_cycle_t *cycle); static char *ngx_server_block(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy); static int ngx_cmp_locations(const void *first, const void *second); static char *ngx_location_block(ngx_conf_t *cf, ngx_command_t *cmd, @@ -304,7 +303,7 @@ ngx_module_t ngx_http_core_module = { ngx_http_core_commands, /* module directives */ NGX_HTTP_MODULE, /* module type */ NULL, /* init module */ - ngx_http_core_init_process /* init process */ + NULL /* init process */ }; @@ -822,6 +821,8 @@ int ngx_http_delay_handler(ngx_http_request_t *r) #endif +#if 0 + static ngx_int_t ngx_http_core_init_process(ngx_cycle_t *cycle) { ngx_uint_t i; @@ -853,6 +854,8 @@ static ngx_int_t ngx_http_core_init_process(ngx_cycle_t *cycle) return NGX_OK; } +#endif + static char *ngx_server_block(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy) { diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h index 98e020b1f..b71979b57 100644 --- a/src/http/ngx_http_core_module.h +++ b/src/http/ngx_http_core_module.h @@ -47,9 +47,6 @@ typedef struct { typedef struct { - ngx_recv_pt recv; - ngx_send_chain_pt send_chain; - /* * array of ngx_http_core_loc_conf_t, used in the translation handler * and in the merge phase diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 302b92497..e1463bafd 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -6,6 +6,9 @@ static void ngx_http_init_request(ngx_event_t *ev); +#if (NGX_HTTP_SSL) +static void ngx_http_check_ssl_handshake(ngx_event_t *rev); +#endif static void ngx_http_process_request_line(ngx_event_t *rev); static void ngx_http_process_request_headers(ngx_event_t *rev); static ssize_t ngx_http_read_request_header(ngx_http_request_t *r); @@ -40,6 +43,7 @@ static char *client_header_errors[] = { "client %s sent HTTP/1.1 request without \"Host\" header, URL: %s", "client %s sent invalid \"Content-Length\" header, URL: %s", "client %s sent POST method without \"Content-Length\" header, URL: %s", + "client %s sent plain HTTP request to HTTPS port, URL: %s", "client %s sent invalid \"Host\" header \"%s\", URL: %s" }; @@ -232,16 +236,24 @@ static void ngx_http_init_request(ngx_event_t *rev) r->srv_conf = cscf->ctx->srv_conf; r->loc_conf = cscf->ctx->loc_conf; + rev->event_handler = ngx_http_process_request_line; + + r->recv = ngx_recv; + r->send_chain = ngx_send_chain; + #if (NGX_HTTP_SSL) - sscf = ngx_http_get_module_srv_conf(r, ngx_http_ssl_filter_module); + sscf = ngx_http_get_module_srv_conf(r, ngx_http_ssl_module); if (sscf->enable) { - if (ngx_ssl_create_session(sscf->ssl_ctx, c) == NGX_ERROR) { + if (ngx_ssl_create_session(sscf->ssl_ctx, c, NGX_SSL_BUFFER) + == NGX_ERROR) + { ngx_http_close_connection(c); return; } r->filter_need_in_memory = 1; + rev->event_handler = ngx_http_check_ssl_handshake; } #endif @@ -321,10 +333,58 @@ static void ngx_http_init_request(ngx_event_t *rev) r->http_state = NGX_HTTP_READING_REQUEST_STATE; + rev->event_handler(rev); +} + + +#if (NGX_HTTP_SSL) + +static void ngx_http_check_ssl_handshake(ngx_event_t *rev) +{ + int n; + u_char buf[1]; + ngx_connection_t *c; + ngx_http_request_t *r; + + c = rev->data; + r = c->data; + + ngx_log_debug0(NGX_LOG_DEBUG_HTTP, rev->log, 0, + "http check ssl handshake"); + + if (rev->timedout) { + ngx_http_client_error(r, 0, NGX_HTTP_REQUEST_TIME_OUT); + return; + } + + n = recv(c->fd, buf, 1, MSG_PEEK); + + if (n == -1 && ngx_socket_errno == NGX_EAGAIN) { + return; + } + + if (n == 1) { + if (buf[0] == 0x80 /* SSLv2 */ || buf[0] == 0x16 /* SSLv3/TLSv1 */) { + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, rev->log, 0, + "https ssl handshake: 0x%X", buf[0]); + + r->recv = ngx_ssl_recv; + r->send_chain = ngx_ssl_send_chain; + + } else { + ngx_log_debug0(NGX_LOG_DEBUG_HTTP, rev->log, 0, + "plain http"); + + r->plain_http = 1; + } + } + rev->event_handler = ngx_http_process_request_line; ngx_http_process_request_line(rev); } +#endif + static void ngx_http_process_request_line(ngx_event_t *rev) { @@ -832,13 +892,12 @@ static ssize_t ngx_http_read_request_header(ngx_http_request_t *r) return NGX_AGAIN; } - cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module); - - n = cscf->recv(r->connection, r->header_in->last, - r->header_in->end - r->header_in->last); + n = r->recv(r->connection, r->header_in->last, + r->header_in->end - r->header_in->last); if (n == NGX_AGAIN) { if (!r->header_timeout_set) { + cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module); ngx_add_timer(rev, cscf->client_header_timeout); r->header_timeout_set = 1; } @@ -939,6 +998,10 @@ static ngx_int_t ngx_http_process_request_header(ngx_http_request_t *r) return NGX_HTTP_PARSE_POST_WO_CL_HEADER; } + if (r->plain_http) { + return NGX_HTTP_PARSE_HTTP_TO_HTTPS; + } + if (r->headers_in.connection) { if (r->headers_in.connection->value.len == 5 && ngx_strcasecmp(r->headers_in.connection->value.data, "close") @@ -1873,7 +1936,9 @@ static void ngx_http_client_error(ngx_http_request_t *r, r->connection->log->handler = NULL; if (ctx->url) { - if (client_error == NGX_HTTP_PARSE_INVALID_HOST) { + switch (client_error) { + + case NGX_HTTP_PARSE_INVALID_HOST: ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, client_header_errors[client_error - NGX_HTTP_CLIENT_ERROR], ctx->client, r->headers_in.host->value.data, ctx->url); @@ -1888,7 +1953,14 @@ static void ngx_http_client_error(ngx_http_request_t *r, return; } - } else { + break; + + case NGX_HTTP_PARSE_HTTP_TO_HTTPS: + error = NGX_HTTP_TO_HTTPS; + + /* fall through */ + + default: ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, client_header_errors[client_error - NGX_HTTP_CLIENT_ERROR], ctx->client, ctx->url); diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h index 7abd57f80..a80e0a57d 100644 --- a/src/http/ngx_http_request.h +++ b/src/http/ngx_http_request.h @@ -31,7 +31,8 @@ #define NGX_HTTP_PARSE_NO_HOST_HEADER 16 #define NGX_HTTP_PARSE_INVALID_CL_HEADER 17 #define NGX_HTTP_PARSE_POST_WO_CL_HEADER 18 -#define NGX_HTTP_PARSE_INVALID_HOST 19 +#define NGX_HTTP_PARSE_HTTP_TO_HTTPS 19 +#define NGX_HTTP_PARSE_INVALID_HOST 20 #define NGX_HTTP_OK 200 @@ -217,6 +218,9 @@ struct ngx_http_request_s { ngx_connection_t *connection; + ngx_recv_pt recv; + ngx_send_chain_pt send_chain; + void **ctx; void **main_conf; void **srv_conf; @@ -292,6 +296,7 @@ struct ngx_http_request_s { /* can we use sendfile ? */ unsigned sendfile:1; + unsigned plain_http:1; unsigned chunked:1; unsigned header_only:1; unsigned keepalive:1; diff --git a/src/http/ngx_http_write_filter.c b/src/http/ngx_http_write_filter.c index 5d45f37e5..8b1447a44 100644 --- a/src/http/ngx_http_write_filter.c +++ b/src/http/ngx_http_write_filter.c @@ -7,6 +7,9 @@ typedef struct { ngx_chain_t *out; + + /* unsigned flush:1; */ + ngx_uint_t flush; } ngx_http_write_filter_ctx_t; @@ -42,7 +45,6 @@ ngx_int_t ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in) int last; off_t size, flush, sent; ngx_chain_t *cl, *ln, **ll, *chain; - ngx_http_core_srv_conf_t *cscf; ngx_http_core_loc_conf_t *clcf; ngx_http_write_filter_ctx_t *ctx; @@ -114,7 +116,7 @@ ngx_int_t ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in) return NGX_AGAIN; } - if (size == 0) { + if (size == 0 && !ctx->flush) { if (!last) { ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, "the http output chain is empty"); @@ -124,11 +126,8 @@ ngx_int_t ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in) sent = r->connection->sent; - cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module); - - chain = cscf->send_chain(r->connection, ctx->out, - clcf->limit_rate ? clcf->limit_rate: - OFF_T_MAX_VALUE); + chain = r->send_chain(r->connection, ctx->out, + clcf->limit_rate ? clcf->limit_rate: OFF_T_MAX_VALUE); ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http write filter %X", chain); @@ -144,6 +143,12 @@ ngx_int_t ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in) return NGX_ERROR; } + if (chain == NGX_CHAIN_AGAIN) { + ctx->out = NULL; + ctx->flush = 1; + return NGX_AGAIN; + } + ctx->out = chain; if (chain == NULL) { -- cgit