You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2014/09/26 12:59:00 UTC
svn commit: r1627747 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/mappers/mod_negotiation.c modules/proxy/mod_proxy_wstunnel.c
server/util_ebcdic.c server/util_expr_eval.c
Author: jim
Date: Fri Sep 26 10:59:00 2014
New Revision: 1627747
URL: http://svn.apache.org/r1627747
Log:
Merge r1619297, r1621806 from trunk:
Missing va_end spotted by cppcheck
Silent some cppcheck warnings.
Submitted by: jailletc36
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/mappers/mod_negotiation.c
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_wstunnel.c
httpd/httpd/branches/2.4.x/server/util_ebcdic.c
httpd/httpd/branches/2.4.x/server/util_expr_eval.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1619297,1621806
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1627747&r1=1627746&r2=1627747&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Sep 26 10:59:00 2014
@@ -102,13 +102,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * core: Add missing va_end spotted by cppcheck
- various: Silent some cppcheck warnings
- trunk patch: http://svn.apache.org/r1619297
- http://svn.apache.org/r1621806
- 2.4.x patch: trunk works (except for mod_journald which is not part of 2.4.x)
- +1: jailletc36, jim, ylavic
-
* mod_cache: CVE-2014-3581 - Avoid a crash when Content-Type has an empty
value. PR56924.
trunk patch: http://svn.apache.org/r1624234
Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_negotiation.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_negotiation.c?rev=1627747&r1=1627746&r2=1627747&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/mappers/mod_negotiation.c (original)
+++ httpd/httpd/branches/2.4.x/modules/mappers/mod_negotiation.c Fri Sep 26 10:59:00 2014
@@ -1707,7 +1707,7 @@ static void set_language_quality(negotia
* we are allowed to use the prefix of in HTTP/1.1
*/
char *lang = ((char **) (variant->content_languages->elts))[j];
- int idx = -1;
+ int idx;
/* If we wish to fallback or
* we use our own LanguagePriority index.
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_wstunnel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_wstunnel.c?rev=1627747&r1=1627746&r2=1627747&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_wstunnel.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_wstunnel.c Fri Sep 26 10:59:00 2014
@@ -151,7 +151,7 @@ static int ap_proxy_wstunnel_request(apr
apr_uri_t *uri,
char *url, char *server_portstr)
{
- apr_status_t rv = APR_SUCCESS;
+ apr_status_t rv;
apr_pollset_t *pollset;
apr_pollfd_t pollfd;
const apr_pollfd_t *signalled;
Modified: httpd/httpd/branches/2.4.x/server/util_ebcdic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/util_ebcdic.c?rev=1627747&r1=1627746&r2=1627747&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/util_ebcdic.c (original)
+++ httpd/httpd/branches/2.4.x/server/util_ebcdic.c Fri Sep 26 10:59:00 2014
@@ -104,8 +104,10 @@ int ap_rvputs_proto_in_ascii(request_rec
len = strlen(s);
ascii_s = apr_pstrmemdup(r->pool, s, len);
ap_xlate_proto_to_ascii(ascii_s, len);
- if (ap_rputs(ascii_s, r) < 0)
+ if (ap_rputs(ascii_s, r) < 0) {
+ va_end(va);
return -1;
+ }
written += len;
}
va_end(va);
Modified: httpd/httpd/branches/2.4.x/server/util_expr_eval.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/util_expr_eval.c?rev=1627747&r1=1627746&r2=1627747&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/util_expr_eval.c (original)
+++ httpd/httpd/branches/2.4.x/server/util_expr_eval.c Fri Sep 26 10:59:00 2014
@@ -236,10 +236,8 @@ static int ap_expr_eval_comp(ap_expr_eva
do {
const ap_expr_t *val = e2->node_arg1;
AP_DEBUG_ASSERT(e2->node_op == op_ListElement);
- if (strcmp(needle, ap_expr_eval_word(ctx, val)) == 0) {
+ if (strcmp(needle, ap_expr_eval_word(ctx, val)) == 0)
return 1;
- break;
- }
e2 = e2->node_arg2;
} while (e2 != NULL);
}