mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-06 06:46:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor ngx_http_arg() using ngx_strcasestrn(),

Browse Source 
back out zero termination introduced in r2138
This commit is contained in:
Igor Sysoev 2009-04-04 17:51:38 +00:00
parent 21a3c66a87
commit 1dcaa97ccc
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/http/ngx_http_parse.c
View File

@ -1486,20 +1486,20 @@ ngx_http_parse_multi_header_lines(ngx_array_t *headers, ngx_str_t *name,
ngx_int_t ngx_int_t
ngx_http_arg(ngx_http_request_t *r, u_char *name, size_t len, ngx_str_t *value) ngx_http_arg(ngx_http_request_t *r, u_char *name, size_t len, ngx_str_t *value)
{ {
u_char *p; u_char *p, *last;
if (r->args.len == 0) { if (r->args.len == 0) {
return NGX_DECLINED; return NGX_DECLINED;
} }
for (p = r->args.data; *p && *p != ' '; p++) { p = r->args.data;
last = p + r->args.len;
/* for ( /* void */ ; p < last; p++) {
* although r->args.data is not null-terminated by itself,
* however, there is null in the end of request line
*/
p = ngx_strcasestrn(p, (char *) name, len - 1); /* we need '=' after name, so drop one char from last */
p = ngx_strlcasestrn(p, last - 1, name, len - 1);
if (p == NULL) { if (p == NULL) {
return NGX_DECLINED; return NGX_DECLINED;
@ -1509,7 +1509,7 @@ ngx_http_arg(ngx_http_request_t *r, u_char *name, size_t len, ngx_str_t *value)
value->data = p + len + 1; value->data = p + len + 1;
p = (u_char *) ngx_strchr(p, '&'); p = ngx_strlchr(p, last, '&');
if (p == NULL) { if (p == NULL) {
p = r->args.data + r->args.len; p = r->args.data + r->args.len;

1
src/http/ngx_http_request.c
View File

@ -697,7 +697,6 @@ ngx_http_process_request_line(ngx_event_t *rev)
r->request_line.len = r->request_end - r->request_start; r->request_line.len = r->request_end - r->request_start;
r->request_line.data = r->request_start; r->request_line.data = r->request_start;
*r->request_end = '\0';
if (r->args_start) { if (r->args_start) {