bugfix: compilation errors with nginx older than 0.9.2.

agentzh · agentzh · commit f632a2591aa7 · 2013-11-01T15:00:01.000-07:00
diff --git a/src/ngx_http_srcache_fetch.c b/src/ngx_http_srcache_fetch.c
@@ -20,7 +20,9 @@ static ngx_int_t ngx_http_srcache_fetch_subrequest(ngx_http_request_t *r,
         ngx_http_srcache_loc_conf_t *conf, ngx_http_srcache_ctx_t *ctx);
 static ngx_int_t ngx_http_srcache_fetch_header_filter(ngx_http_request_t *r);
 static ngx_int_t ngx_http_srcache_test_not_modified(ngx_http_request_t *r);
+#if defined(nginx_version) && (nginx_version >= 9002)
 static ngx_int_t ngx_http_srcache_test_precondition(ngx_http_request_t *r);
+#endif
 static void ngx_http_srcache_post_read_body(ngx_http_request_t *r);
 
 
@@ -453,9 +455,11 @@ ngx_http_srcache_fetch_header_filter(ngx_http_request_t *r)
         return ngx_http_srcache_next_header_filter(r);
     }
 
+#if defined(nginx_version) && (nginx_version >= 9002)
     if (r->headers_in.if_unmodified_since) {
         return ngx_http_srcache_test_precondition(r);
     }
+#endif
 
     if (r->headers_in.if_modified_since) {
         return ngx_http_srcache_test_not_modified(r);
@@ -508,6 +512,7 @@ ngx_http_srcache_test_not_modified(ngx_http_request_t *r)
 }
 
 
+#if defined(nginx_version) && (nginx_version >= 9002)
 static ngx_int_t
 ngx_http_srcache_test_precondition(ngx_http_request_t *r)
 {
@@ -527,6 +532,7 @@ ngx_http_srcache_test_precondition(ngx_http_request_t *r)
     return ngx_http_filter_finalize_request(r, NULL,
                                             NGX_HTTP_PRECONDITION_FAILED);
 }
+#endif
 
 
 static void

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@ static ngx_int_t ngx_http_srcache_fetch_subrequest(ngx_http_request_t *r,`
`20`	`20`	`ngx_http_srcache_loc_conf_t conf, ngx_http_srcache_ctx_t ctx);`
`21`	`21`	`static ngx_int_t ngx_http_srcache_fetch_header_filter(ngx_http_request_t *r);`
`22`	`22`	`static ngx_int_t ngx_http_srcache_test_not_modified(ngx_http_request_t *r);`
	`23`	`+#if defined(nginx_version) && (nginx_version >= 9002)`
`23`	`24`	`static ngx_int_t ngx_http_srcache_test_precondition(ngx_http_request_t *r);`
	`25`	`+#endif`
`24`	`26`	`static void ngx_http_srcache_post_read_body(ngx_http_request_t *r);`
`25`	`27`
`26`	`28`
`@@ -453,9 +455,11 @@ ngx_http_srcache_fetch_header_filter(ngx_http_request_t *r)`
`453`	`455`	`return ngx_http_srcache_next_header_filter(r);`
`454`	`456`	`}`
`455`	`457`
	`458`	`+#if defined(nginx_version) && (nginx_version >= 9002)`
`456`	`459`	`if (r->headers_in.if_unmodified_since) {`
`457`	`460`	`return ngx_http_srcache_test_precondition(r);`
`458`	`461`	`}`
	`462`	`+#endif`
`459`	`463`
`460`	`464`	`if (r->headers_in.if_modified_since) {`
`461`	`465`	`return ngx_http_srcache_test_not_modified(r);`
`@@ -508,6 +512,7 @@ ngx_http_srcache_test_not_modified(ngx_http_request_t *r)`
`508`	`512`	`}`
`509`	`513`
`510`	`514`
	`515`	`+#if defined(nginx_version) && (nginx_version >= 9002)`
`511`	`516`	`static ngx_int_t`
`512`	`517`	`ngx_http_srcache_test_precondition(ngx_http_request_t *r)`
`513`	`518`	`{`
`@@ -527,6 +532,7 @@ ngx_http_srcache_test_precondition(ngx_http_request_t *r)`
`527`	`532`	`return ngx_http_filter_finalize_request(r, NULL,`
`528`	`533`	`NGX_HTTP_PRECONDITION_FAILED);`
`529`	`534`	`}`
	`535`	`+#endif`
`530`	`536`
`531`	`537`
`532`	`538`	`static void`