diff options
| author | Yann Ylavic <ylavic@apache.org> | 2018-08-13 12:54:30 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2018-08-13 12:54:30 +0000 |
| commit | a920a90838f4ad5b9b8460e539b250e2c4b7cf2d (patch) | |
| tree | 85bc5a23d6722427e7dc8db20310caca1842b82d /modules/cache | |
| parent | 4176ecb14212543625ee9af15f00a09ba7d04c13 (diff) | |
| download | httpd-a920a90838f4ad5b9b8460e539b250e2c4b7cf2d.tar.gz | |
Axe some redundant conditions. PR 62549.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1837941 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/cache')
| -rw-r--r-- | modules/cache/cache_util.c | 6 | ||||
| -rw-r--r-- | modules/cache/mod_cache.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c index aa049132d1..fc8f2a604c 100644 --- a/modules/cache/cache_util.c +++ b/modules/cache/cache_util.c @@ -711,7 +711,7 @@ int cache_check_freshness(cache_handle_t *h, cache_request_rec *cache, (apr_time_sec(info->expire - info->date)) > age))) { /* make sure we don't stomp on a previous warning */ if ((warn_head == NULL) || - ((warn_head != NULL) && (ap_strstr_c(warn_head, "110") == NULL))) { + (ap_strstr_c(warn_head, "110") == NULL)) { apr_table_mergen(h->resp_hdrs, "Warning", "110 Response is stale"); } @@ -730,7 +730,7 @@ int cache_check_freshness(cache_handle_t *h, cache_request_rec *cache, * the new warning to the correct *headers_out location. */ if ((warn_head == NULL) || - ((warn_head != NULL) && (ap_strstr_c(warn_head, "113") == NULL))) { + (ap_strstr_c(warn_head, "113") == NULL)) { apr_table_mergen(h->resp_hdrs, "Warning", "113 Heuristic expiration"); } @@ -787,7 +787,7 @@ int cache_check_freshness(cache_handle_t *h, cache_request_rec *cache, /* make sure we don't stomp on a previous warning */ warn_head = apr_table_get(h->resp_hdrs, "Warning"); if ((warn_head == NULL) || - ((warn_head != NULL) && (ap_strstr_c(warn_head, "110") == NULL))) { + (ap_strstr_c(warn_head, "110") == NULL)) { apr_table_mergen(h->resp_hdrs, "Warning", "110 Response is stale"); } diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c index fad3df273c..f49eb56bfc 100644 --- a/modules/cache/mod_cache.c +++ b/modules/cache/mod_cache.c @@ -909,8 +909,8 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in) /* add a revalidation warning */ warn_head = apr_table_get(r->err_headers_out, "Warning"); - if ((warn_head == NULL) || ((warn_head != NULL) - && (ap_strstr_c(warn_head, "111") == NULL))) { + if ((warn_head == NULL) || + (ap_strstr_c(warn_head, "111") == NULL)) { apr_table_mergen(r->err_headers_out, "Warning", "111 Revalidation failed"); } @@ -1901,8 +1901,8 @@ static void cache_insert_error_filter(request_rec *r) /* add a revalidation warning */ warn_head = apr_table_get(r->err_headers_out, "Warning"); - if ((warn_head == NULL) || ((warn_head != NULL) - && (ap_strstr_c(warn_head, "111") == NULL))) { + if ((warn_head == NULL) + || ap_strstr_c(warn_head, "111") == NULL) { apr_table_mergen(r->err_headers_out, "Warning", "111 Revalidation failed"); } |