nginx: src/http/ngx_http_core_module.c comparison

nginx-0.0.3-2004-04-21-22:54:33 import

comparison

equal deleted inserted replaced

-:ab2f8c9a2a45
+:ba876b26b76d
 static char *ngx_set_error_page(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
 ngx_http_core_loc_conf_t *lcf = conf;
-ngx_uint_t            i;
+int                   overwrite;
+ngx_uint_t            i, n;
 ngx_str_t            *value;
 ngx_http_err_page_t  *err;
 if (lcf->error_pages == NULL) {
 lcf->error_pages = ngx_create_array(cf->pool, 5,
 }
 }
 value = cf->args->elts;
-for (i = 1; i < cf->args->nelts - 1; i++) {
+i = cf->args->nelts - 2;
-ngx_test_null(err, ngx_push_array(lcf->error_pages), NGX_CONF_ERROR);
+if (value[i].data[0] == '=') {
+if (i == 1) {
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+"invalid value \"%s\"", value[i].data);
+return NGX_CONF_ERROR;
+}
+overwrite = ngx_atoi(&value[i].data[1], value[i].len - 1);
+if (overwrite == NGX_ERROR) {
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+"invalid value \"%s\"", value[i].data);
+return NGX_CONF_ERROR;
+}
+n = 2;
+} else {
+overwrite = 0;
+n = 1;
+}
+for (i = 1; i < cf->args->nelts - n; i++) {
+if (!(err = ngx_push_array(lcf->error_pages))) {
+return NGX_CONF_ERROR;
+}
 err->code = ngx_atoi(value[i].data, value[i].len);
 if (err->code == NGX_ERROR) {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 "invalid value \"%s\"", value[i].data);
 return NGX_CONF_ERROR;
 "value \"%s\" must be between 400 and 599",
 value[i].data);
 return NGX_CONF_ERROR;
 }
+err->overwrite = overwrite;
 err->uri = value[cf->args->nelts - 1];
 }
 return NGX_CONF_OK;
 }

Mercurial > hg > nginx