summaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/ngx_hunk.c4
-rw-r--r--src/core/ngx_modules.c2
-rw-r--r--src/core/ngx_string.h2
3 files changed, 8 insertions, 0 deletions
diff --git a/src/core/ngx_hunk.c b/src/core/ngx_hunk.c
index 1441b7c08..992db16a0 100644
--- a/src/core/ngx_hunk.c
+++ b/src/core/ngx_hunk.c
@@ -152,6 +152,10 @@ void ngx_chain_update_chains(ngx_chain_t **free, ngx_chain_t **busy,
break;
}
#endif
+ if (((*busy)->hunk->type & NGX_HUNK_TEMP) == 0) {
+ *busy = (*busy)->next;
+ continue;
+ }
(*busy)->hunk->pos = (*busy)->hunk->last = (*busy)->hunk->start;
diff --git a/src/core/ngx_modules.c b/src/core/ngx_modules.c
index 8d3c5c075..0d6389f4d 100644
--- a/src/core/ngx_modules.c
+++ b/src/core/ngx_modules.c
@@ -34,6 +34,7 @@ extern ngx_module_t ngx_http_header_filter_module;
extern ngx_module_t ngx_http_chunked_filter_module;
extern ngx_module_t ngx_http_gzip_filter_module;
+extern ngx_module_t ngx_http_not_modified_filter_module;
extern ngx_module_t ngx_http_range_filter_module;
extern ngx_module_t ngx_http_charset_filter_module;
@@ -83,6 +84,7 @@ ngx_module_t *ngx_modules[] = {
&ngx_http_chunked_filter_module,
&ngx_http_gzip_filter_module,
+ &ngx_http_not_modified_filter_module,
&ngx_http_range_filter_module,
/* &ngx_http_ssi_filter_module, */
&ngx_http_charset_filter_module,
diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h
index 9171ea073..665c84450 100644
--- a/src/core/ngx_string.h
+++ b/src/core/ngx_string.h
@@ -23,6 +23,7 @@ typedef struct {
#define ngx_strncmp strncmp
#define ngx_strcmp strcmp
+#define ngx_strstr strstr
#define ngx_strlen strlen
#define ngx_snprintf _snprintf
@@ -35,6 +36,7 @@ typedef struct {
#define ngx_strncmp strncmp
#define ngx_strcmp strcmp
+#define ngx_strstr strstr
#define ngx_strlen strlen
#define ngx_snprintf snprintf