diff options
| author | Jim Jagielski <jim@apache.org> | 2015-12-29 16:26:41 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2015-12-29 16:26:41 +0000 |
| commit | 6b0ce097fb05c1895b738da8f480f0145181b88d (patch) | |
| tree | c0e5f85d5727108243da4f4fc352c012df11a2b3 /modules/metadata | |
| parent | 93310ba419b3a0fdfb8eaf570e11e097d7906ac8 (diff) | |
| download | httpd-6b0ce097fb05c1895b738da8f480f0145181b88d.tar.gz | |
Merge r1715567, r1715568, r1715570, r1715571, r1715572, r1715576, r1715581, r1715582, r1715583, r1715584, r1715585 from trunk:
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Add a blank line between functions.
Remove some useless 'return' statements.
Fix style and alignment.
Remove some useless 'return' statements.
Fix style.
Remove some useless 'return' statements.
Add a blank line between functions.
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1722180 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/metadata')
| -rw-r--r-- | modules/metadata/mod_expires.c | 2 | ||||
| -rw-r--r-- | modules/metadata/mod_usertrack.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c index 8f8a777693..447fce48df 100644 --- a/modules/metadata/mod_expires.c +++ b/modules/metadata/mod_expires.c @@ -546,8 +546,8 @@ static void expires_insert_filter(request_rec *r) return; } ap_add_output_filter("MOD_EXPIRES", NULL, r, r->connection); - return; } + static void register_hooks(apr_pool_t *p) { /* mod_expires needs to run *before* the cache save filter which is diff --git a/modules/metadata/mod_usertrack.c b/modules/metadata/mod_usertrack.c index 377c77bc45..73a9f45cc6 100644 --- a/modules/metadata/mod_usertrack.c +++ b/modules/metadata/mod_usertrack.c @@ -148,7 +148,6 @@ static void make_cookie(request_rec *r) (dcfg->style == CT_COOKIE2 ? "Set-Cookie2" : "Set-Cookie"), new_cookie); apr_table_setn(r->notes, "cookie", apr_pstrdup(r->pool, cookiebuf)); /* log first time */ - return; } /* dcfg->regexp is "^cookie_name=([^;]+)|;[ \t]+cookie_name=([^;]+)", |