Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_ssi_filter_module.c @ 672:f41d4b305d22 NGINX_1_2_0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.2.0 *) Bugfix: a segmentation fault might occur in a worker process if the "try_files" directive was used; the bug had appeared in 1.1.19. *) Bugfix: response might be truncated if there were more than IOV_MAX buffers used. *) Bugfix: in the "crop" parameter of the "image_filter" directive. Thanks to Maxim Bublis.
author Igor Sysoev <http://sysoev.ru>
date Mon, 23 Apr 2012 00:00:00 +0400
parents ad45b044f1e5
children 597573166f34
comparison
equal deleted inserted replaced
671:47cb3497fbab 672:f41d4b305d22
2001 return NGX_HTTP_SSI_ERROR; 2001 return NGX_HTTP_SSI_ERROR;
2002 } 2002 }
2003 2003
2004 if (set && stub) { 2004 if (set && stub) {
2005 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, 2005 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
2006 "\"set\" and \"stub\" may not be used together " 2006 "\"set\" and \"stub\" cannot be used together "
2007 "in \"include\" SSI command"); 2007 "in \"include\" SSI command");
2008 return NGX_HTTP_SSI_ERROR; 2008 return NGX_HTTP_SSI_ERROR;
2009 } 2009 }
2010 2010
2011 if (wait) { 2011 if (wait) {
2012 if (uri == NULL) { 2012 if (uri == NULL) {
2013 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, 2013 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
2014 "\"wait\" may not be used with file=\"%V\"", file); 2014 "\"wait\" cannot be used with file=\"%V\"", file);
2015 return NGX_HTTP_SSI_ERROR; 2015 return NGX_HTTP_SSI_ERROR;
2016 } 2016 }
2017 2017
2018 if (wait->len == 2 2018 if (wait->len == 2
2019 && ngx_strncasecmp(wait->data, (u_char *) "no", 2) == 0) 2019 && ngx_strncasecmp(wait->data, (u_char *) "no", 2) == 0)
2186 2186
2187 return NGX_AGAIN; 2187 return NGX_AGAIN;
2188 2188
2189 } else { 2189 } else {
2190 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, 2190 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
2191 "only one subrequest may be waited at the same time"); 2191 "can only wait for one subrequest at a time");
2192 } 2192 }
2193 2193
2194 return NGX_OK; 2194 return NGX_OK;
2195 } 2195 }
2196 2196