@@ -88,48 +88,49 @@ static ngx_int_t ngx_http_accept_language_variable(ngx_http_request_t *r, ngx_ht
u_char *start, *pos, *end;
ngx_array_t *langs_array = (ngx_array_t *) data;
ngx_str_t *langs = (ngx_str_t *) langs_array->elts;
-
- start = r->headers_in.accept_language->value.data;
- end = start + r->headers_in.accept_language->value.len;
- while (start < end) {
- // eating spaces
- while (start < end && *start == ' ') {start++; }
+ if ( NULL != r->headers_in.accept_language ) {
+ start = r->headers_in.accept_language->value.data;
+ end = start + r->headers_in.accept_language->value.len;
+
+ while (start < end) {
+ // eating spaces
+ while (start < end && *start == ' ') {start++; }
- pos = start;
+ pos = start;
- while (pos < end && *pos != ',' && *pos != ';') { pos++; }
+ while (pos < end && *pos != ',' && *pos != ';') { pos++; }
- for (i = 0; i < langs_array->nelts; i++)
- {
- if ((ngx_uint_t)(pos - start) >= langs[i].len && ngx_strncasecmp(start, langs[i].data, langs[i].len) == 0) {
- found = 1;
- break;
+ for (i = 0; i < langs_array->nelts; i++)
+ {
+ if ((ngx_uint_t)(pos - start) >= langs[i].len && ngx_strncasecmp(start, langs[i].data, langs[i].len) == 0) {
+ found = 1;
+ break;
+ }
}
- }
- if (found)
- break;
+ if (found)
+ break;
- i = 0; // If not found default to the first language from the list
+ i = 0; // If not found default to the first language from the list
- // We discard the quality value
- if (*pos == ';') {
- while (pos < end && *pos != ',') {pos++; }
- }
- if (*pos == ',') {
- pos++;
- }
+ // We discard the quality value
+ if (*pos == ';') {
+ while (pos < end && *pos != ',') {pos++; }
+ }
+ if (*pos == ',') {
+ pos++;
+ }
- start = pos;
+ start = pos;
+ }
}
-
v->data = langs[i].data;
v->len = langs[i].len;
-
+
/* Set all required params */
v->valid = 1;
v->no_cacheable = 0;
v->not_found = 0;
return NGX_OK;
-}
\ No newline at end of file
+}
src/ngx_http_accept_language_module.c
8da19c746949a4ac5ec9b459dcbd2f53a44b1b7f
Guillaume Maury
pm@gom-jabbar.org
http://github.com/giom/nginx_accept_language_module/commit/06b66da2fcd75f3e2f17f6b0af8f3525244968ea
06b66da2fcd75f3e2f17f6b0af8f3525244968ea
2008-12-05T09:33:31-08:00
2008-12-05T09:33:31-08:00
Fixed a bug where having a nil Accept-Language header would interupt the execution of the set_from_accept_language directive (I'm a bit ashamed at letting this bug through...)
Thanks goes to Paulo Almeida (pma) for finding this bug and sending me the patch
640fdfcaa04b358fa0c687fb35a82ca3f8f9a595
Guillaume Maury
pm@gom-jabbar.org