@@ -234,46 +234,35 @@ ngx_http_modsecurity_process_url(ngx_http_request_t *r)
234
234
static ngx_int_t
235
235
ngx_http_modsecurity_process_req_header (ngx_http_request_t * r )
236
236
{
237
+ ngx_uint_t i ;
237
238
ngx_pool_t * old_pool ;
239
+ ngx_list_part_t * part ;
240
+ ngx_table_elt_t * header ;
238
241
ngx_http_modsecurity_ctx_t * ctx ;
239
242
240
243
ctx = ngx_http_get_module_ctx (r , ngx_http_modsecurity_module );
241
244
if (ctx == NULL ) {
242
245
return NGX_ERROR ;
243
246
}
244
247
245
- /**
246
- * Since incoming request headers are already in place, lets send it to ModSecurity
247
- *
248
- */
249
- ngx_list_part_t * part = & r -> headers_in .headers .part ;
250
- ngx_table_elt_t * data = part -> elts ;
251
- ngx_uint_t i = 0 ;
252
- for (i = 0 ; /* void */ ; i ++ ) {
248
+ part = & r -> headers_in .headers .part ;
249
+ header = part -> elts ;
250
+
251
+ for (i = 0 ; /* void */ ; i ++ ) {
252
+
253
253
if (i >= part -> nelts ) {
254
254
if (part -> next == NULL ) {
255
255
break ;
256
256
}
257
257
258
258
part = part -> next ;
259
- data = part -> elts ;
259
+ header = part -> elts ;
260
260
i = 0 ;
261
261
}
262
262
263
- /**
264
- * By using u_char (utf8_t) I believe nginx is hoping to deal
265
- * with utf8 strings.
266
- * Casting those into to unsigned char * in order to pass
267
- * it to ModSecurity, it will handle with those later.
268
- *
269
- */
270
-
271
- dd ("Adding request header: %.*s with value %.*s" , (int )data [i ].key .len , data [i ].key .data , (int ) data [i ].value .len , data [i ].value .data );
272
263
msc_add_n_request_header (ctx -> modsec_transaction ,
273
- (const unsigned char * ) data [i ].key .data ,
274
- data [i ].key .len ,
275
- (const unsigned char * ) data [i ].value .data ,
276
- data [i ].value .len );
264
+ header [i ].key .data , header [i ].key .len ,
265
+ header [i ].value .data , header [i ].value .len );
277
266
}
278
267
279
268
/**
0 commit comments