Mercurial > hg > nginx
changeset 1543:8596627c4cc5
use ngx_strstrn() and ngx_strcasestrn()
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 26 Sep 2007 19:26:14 +0000 |
parents | f5bd1a7ed2cd |
children | 998c44b19e30 |
files | src/http/modules/ngx_http_gzip_filter_module.c src/http/ngx_http_request.c src/http/ngx_http_upstream.c |
diffstat | 3 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_gzip_filter_module.c Wed Sep 26 19:25:52 2007 +0000 +++ b/src/http/modules/ngx_http_gzip_filter_module.c Wed Sep 26 19:26:14 2007 +0000 @@ -279,7 +279,7 @@ || r->headers_in.accept_encoding == NULL || (r->headers_out.content_length_n != -1 && r->headers_out.content_length_n < conf->min_length) - || ngx_strstr(r->headers_in.accept_encoding->value.data, "gzip") == NULL + || ngx_strcasestrn(r->headers_in.accept_encoding->value.data, "gzip", 3) ) { return ngx_http_next_header_filter(r);
--- a/src/http/ngx_http_request.c Wed Sep 26 19:25:52 2007 +0000 +++ b/src/http/ngx_http_request.c Wed Sep 26 19:26:14 2007 +0000 @@ -1204,10 +1204,10 @@ ngx_http_process_connection(ngx_http_request_t *r, ngx_table_elt_t *h, ngx_uint_t offset) { - if (ngx_strstr(h->value.data, "close")) { + if (ngx_strcasestrn(h->value.data, "close", 4)) { r->headers_in.connection_type = NGX_HTTP_CONNECTION_CLOSE; - } else if (ngx_strstr(h->value.data, "keep-alive")) { + } else if (ngx_strcasestrn(h->value.data, "keep-alive", 9)) { r->headers_in.connection_type = NGX_HTTP_CONNECTION_KEEP_ALIVE; } @@ -1319,7 +1319,8 @@ } if (r->headers_in.transfer_encoding - && ngx_strstr(r->headers_in.transfer_encoding->value.data, "chunked")) + && ngx_strcasestrn(r->headers_in.transfer_encoding->value.data, + "chunked", 6)) { ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, "client sent \"Transfer-Encoding: chunked\" header"); @@ -1351,7 +1352,7 @@ user_agent = r->headers_in.user_agent->value.data; - ua = (u_char *) ngx_strstr(user_agent, "MSIE"); + ua = ngx_strstrn(user_agent, "MSIE", 3); if (ua && ua + 8 < user_agent + r->headers_in.user_agent->value.len) { @@ -1369,7 +1370,7 @@ #endif } - if (ngx_strstr(user_agent, "Opera")) { + if (ngx_strstrn(user_agent, "Opera", 4)) { r->headers_in.opera = 1; r->headers_in.msie = 0; r->headers_in.msie4 = 0; @@ -1377,10 +1378,10 @@ if (!r->headers_in.msie && !r->headers_in.opera) { - if (ngx_strstr(user_agent, "Gecko/")) { + if (ngx_strstrn(user_agent, "Gecko/", 5)) { r->headers_in.gecko = 1; - } else if (ngx_strstr(user_agent, "Konqueror")) { + } else if (ngx_strstrn(user_agent, "Konqueror", 8)) { r->headers_in.konqueror = 1; } }
--- a/src/http/ngx_http_upstream.c Wed Sep 26 19:25:52 2007 +0000 +++ b/src/http/ngx_http_upstream.c Wed Sep 26 19:26:14 2007 +0000 @@ -2636,7 +2636,7 @@ if (r->upstream->rewrite_redirect) { - p = (u_char *) ngx_strstr(ho->value.data, "url="); + p = ngx_strcasestrn(ho->value.data, "url=", 3); if (p) { rc = r->upstream->rewrite_redirect(r, ho, p + 4 - ho->value.data);