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 2013/11/15 18:07:53 UTC
svn commit: r1542329 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/aaa/mod_authnz_ldap.c modules/loggers/mod_log_config.c
modules/metadata/mod_mime_magic.c modules/proxy/mod_proxy.c
Author: jim
Date: Fri Nov 15 17:07:52 2013
New Revision: 1542329
URL: http://svn.apache.org/r1542329
Log:
Merge r1533065, r1491724, r1425360, r1496194 from trunk:
Eclipse code analysis warning
Reduce stack usage by 3k
style fixes, add comment
no code change
attribute and error reason reversed
Submitted by: jim, jailletc36, sf, covener
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/aaa/mod_authnz_ldap.c
httpd/httpd/branches/2.4.x/modules/loggers/mod_log_config.c
httpd/httpd/branches/2.4.x/modules/metadata/mod_mime_magic.c
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1425360,1491724,1496194,1533065
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1542329&r1=1542328&r2=1542329&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Nov 15 17:07:52 2013
@@ -97,19 +97,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * easy proposals to synch 2.4.x and trunk
- - mod_proxy.c: Eclipse code analysis warning
- - mod_mime_magic.c: Reduce stack usage by 3k
- - mod_log_config.c: style fixes, add comment, no code change
- - mod_authnz_ldap.c: attribute and error reason reversed
- trunk patches:
- - http://svn.apache.org/r1533065
- - http://svn.apache.org/r1491724
- - http://svn.apache.org/r1425360
- - http://svn.apache.org/r1496194
- 2.4.x patch: trunk patches work
- +1: jailletc36, jim, jorton
-
* mod_proxy_fcgi: Sync with trunk
trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1523281
https://svn.apache.org/viewvc?view=revision&revision=1524368
Modified: httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_ldap.c?rev=1542329&r1=1542328&r2=1542329&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_ldap.c (original)
+++ httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_ldap.c Fri Nov 15 17:07:52 2013
@@ -894,7 +894,7 @@ static authz_status ldapgroup_check_auth
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01719)
"auth_ldap authorize: require group \"%s\": "
"didn't match with attr %s [%s][%d - %s]",
- t, ldc->reason, ent[i].name, result,
+ t, ent[i].name, ldc->reason, result,
ldap_err2string(result));
}
}
Modified: httpd/httpd/branches/2.4.x/modules/loggers/mod_log_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/loggers/mod_log_config.c?rev=1542329&r1=1542328&r2=1542329&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/loggers/mod_log_config.c (original)
+++ httpd/httpd/branches/2.4.x/modules/loggers/mod_log_config.c Fri Nov 15 17:07:52 2013
@@ -194,8 +194,8 @@ static void *ap_default_log_writer_init(
static void *ap_buffered_log_writer_init(apr_pool_t *p, server_rec *s,
const char* name);
-static ap_log_writer_init* ap_log_set_writer_init(ap_log_writer_init *handle);
-static ap_log_writer* ap_log_set_writer(ap_log_writer *handle);
+static ap_log_writer_init *ap_log_set_writer_init(ap_log_writer_init *handle);
+static ap_log_writer *ap_log_set_writer(ap_log_writer *handle);
static ap_log_writer *log_writer = ap_default_log_writer;
static ap_log_writer_init *log_writer_init = ap_default_log_writer_init;
static int buffered_logs = 0; /* default unbuffered */
@@ -1507,7 +1507,7 @@ static void ap_register_log_handler(apr_
apr_hash_set(log_hash, tag, 1, (const void *)log_struct);
}
-static ap_log_writer_init* ap_log_set_writer_init(ap_log_writer_init *handle)
+static ap_log_writer_init *ap_log_set_writer_init(ap_log_writer_init *handle)
{
ap_log_writer_init *old = log_writer_init;
log_writer_init = handle;
@@ -1536,6 +1536,10 @@ static apr_status_t ap_default_log_write
int i;
apr_status_t rv;
+ /*
+ * We do this memcpy dance because write() is atomic for len < PIPE_BUF,
+ * while writev() need not be.
+ */
str = apr_palloc(r->pool, len + 1);
for (i = 0, s = str; i < nelts; ++i) {
@@ -1616,6 +1620,10 @@ static apr_status_t ap_buffered_log_writ
if (len >= LOG_BUFSIZE) {
apr_size_t w;
+ /*
+ * We do this memcpy dance because write() is atomic for
+ * len < PIPE_BUF, while writev() need not be.
+ */
str = apr_palloc(r->pool, len + 1);
for (i = 0, s = str; i < nelts; ++i) {
memcpy(s, strs[i], strl[i]);
Modified: httpd/httpd/branches/2.4.x/modules/metadata/mod_mime_magic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/metadata/mod_mime_magic.c?rev=1542329&r1=1542328&r2=1542329&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/metadata/mod_mime_magic.c (original)
+++ httpd/httpd/branches/2.4.x/modules/metadata/mod_mime_magic.c Fri Nov 15 17:07:52 2013
@@ -1973,7 +1973,7 @@ static int ascmagic(request_rec *r, unsi
{
int has_escapes = 0;
unsigned char *s;
- char nbuf[HOWMANY + 1]; /* one extra for terminating '\0' */
+ char nbuf[SMALL_HOWMANY + 1]; /* one extra for terminating '\0' */
char *token;
const struct names *p;
int small_nbytes;
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c?rev=1542329&r1=1542328&r2=1542329&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c Fri Nov 15 17:07:52 2013
@@ -2439,7 +2439,7 @@ static int proxy_status_hook(request_rec
proxy_balancer *balancer = NULL;
proxy_worker **worker = NULL;
- if (flags & AP_STATUS_SHORT || conf->balancers->nelts == 0 ||
+ if ((flags & AP_STATUS_SHORT) || conf->balancers->nelts == 0 ||
conf->proxy_status == status_off)
return OK;