diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-12-12 20:49:45 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-12-12 20:49:45 +0000 |
| commit | 15ec67c6d2d1e9179244d1d2d2b3c08c295c8ec2 (patch) | |
| tree | 971386e408ed7dbfba3699b048c8f2d3b4ff604e /src/http/modules | |
| parent | 932a8a18df48a7cde5b5163d3428414586bf7066 (diff) | |
| download | nginx-15ec67c6d2d1e9179244d1d2d2b3c08c295c8ec2.tar.gz nginx-15ec67c6d2d1e9179244d1d2d2b3c08c295c8ec2.tar.bz2 | |
r1587, r1588, r1589, r1590, r1592, r1599, r1629, r1636, r1674, r1681,
r1682, r1683 merge:
typo and style fixes
Diffstat (limited to 'src/http/modules')
| -rw-r--r-- | src/http/modules/ngx_http_charset_filter_module.c | 9 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_fastcgi_module.c | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/http/modules/ngx_http_charset_filter_module.c b/src/http/modules/ngx_http_charset_filter_module.c index 98919ae2f..8c9fad6f9 100644 --- a/src/http/modules/ngx_http_charset_filter_module.c +++ b/src/http/modules/ngx_http_charset_filter_module.c @@ -366,8 +366,8 @@ ngx_http_charset_header_filter(ngx_http_request_t *r) no_charset_map: ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, - "no \"charset_map\" between the charsets " - "\"%V\" and \"%V\"", from, to); + "no \"charset_map\" between the charsets \"%V\" and \"%V\"", + from, to); return ngx_http_next_header_filter(r); } @@ -1519,9 +1519,8 @@ ngx_http_charset_postconfiguration(ngx_conf_t *cf) } ngx_log_error(NGX_LOG_EMERG, cf->log, 0, - " no \"charset_map\" between the charsets " - "\"%V\" and \"%V\"", - &charset[c].name, &charset[recode[i].dst].name); + "no \"charset_map\" between the charsets \"%V\" and \"%V\"", + &charset[c].name, &charset[recode[i].dst].name); return NGX_ERROR; next: diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c index 36cecdb7b..fb2578bf3 100644 --- a/src/http/modules/ngx_http_fastcgi_module.c +++ b/src/http/modules/ngx_http_fastcgi_module.c @@ -432,7 +432,7 @@ ngx_http_fastcgi_handler(ngx_http_request_t *r) if (r->subrequest_in_memory) { ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, "ngx_http_fastcgi_module does not support " - "subrequest in memeory"); + "subrequest in memory"); return NGX_HTTP_INTERNAL_SERVER_ERROR; } |