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/12/02 13:18:19 UTC
svn commit: r1546976 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/lua/lua_request.c
Author: jim
Date: Mon Dec 2 12:18:19 2013
New Revision: 1546976
URL: http://svn.apache.org/r1546976
Log:
Merge r1544820 from trunk:
mod_lua: Fix compiler warning by using correct
APR_SIZE_T_FMT and APR_OFF_T_FMT format macro
in debug logging.
Submitted by: rjung
Reviewed/backported by: jim
NOTE: Not sure about CHANGES... is there a BUGZ on this?
In general, CHANGES is for userland visible changes or
BUGZ bug fixes, and not sure if this really applies
here. But it's OK if someone wants to add something
to CHANGES.
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/lua/lua_request.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1544820
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1546976&r1=1546975&r2=1546976&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Dec 2 12:18:19 2013
@@ -98,11 +98,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_lua: Fix compiler warning by using correct APR_SIZE_T_FMT and APR_OFF_T_FMT
- format macro in debug logging.
- trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1544820
- 2.4.x patch: trunk patch works, add CHANGES
- +1: rjung, jailletc36, trawick
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/modules/lua/lua_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/lua/lua_request.c?rev=1546976&r1=1546975&r2=1546976&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/lua/lua_request.c (original)
+++ httpd/httpd/branches/2.4.x/modules/lua/lua_request.c Mon Dec 2 12:18:19 2013
@@ -2098,7 +2098,7 @@ static int lua_websocket_read(lua_State
}
}
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
- "Websocket: Reading %lu (%s) bytes, masking is %s. %s",
+ "Websocket: Reading %" APR_SIZE_T_FMT " (%s) bytes, masking is %s. %s",
plen,
(payload >= 126) ? "extra payload" : "no extra payload",
mask ? "on" : "off",
@@ -2133,14 +2133,14 @@ static int lua_websocket_read(lua_State
}
}
ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r,
- "Websocket: Frame contained %lu bytes, pushed to Lua stack",
+ "Websocket: Frame contained %" APR_OFF_T_FMT " bytes, pushed to Lua stack",
at);
}
else {
rv = lua_websocket_readbytes(r->connection, buffer,
remaining);
ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r,
- "Websocket: SSL Frame contained %lu bytes, "\
+ "Websocket: SSL Frame contained %" APR_SIZE_T_FMT " bytes, "\
"pushed to Lua stack",
remaining);
}
@@ -2280,7 +2280,7 @@ static int lua_websocket_ping(lua_State
}
if (plen > 0) {
ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r,
- "Websocket: Reading %lu bytes of PONG", plen);
+ "Websocket: Reading %" APR_SIZE_T_FMT " bytes of PONG", plen);
return 1;
}
if (mask) {
Re: svn commit: r1546976 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/lua/lua_request.c
Posted by Rainer Jung <ra...@kippdata.de>.
On 02.12.2013 13:18, jim@apache.org wrote:
> Author: jim
> Date: Mon Dec 2 12:18:19 2013
> New Revision: 1546976
>
> URL: http://svn.apache.org/r1546976
> Log:
> Merge r1544820 from trunk:
>
> mod_lua: Fix compiler warning by using correct
> APR_SIZE_T_FMT and APR_OFF_T_FMT format macro
> in debug logging.
>
> Submitted by: rjung
> Reviewed/backported by: jim
>
> NOTE: Not sure about CHANGES... is there a BUGZ on this?
> In general, CHANGES is for userland visible changes or
> BUGZ bug fixes, and not sure if this really applies
> here. But it's OK if someone wants to add something
> to CHANGES.
I agree, no need for CHANGES. There's no BZ, I simply noticed the
warning when building the 2.4.7 candidate. I guess I copied the STATUS
remark on CHANGES without actually checking that the patch needs an entry.
> - * mod_lua: Fix compiler warning by using correct APR_SIZE_T_FMT and APR_OFF_T_FMT
> - format macro in debug logging.
> - trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1544820
> - 2.4.x patch: trunk patch works, add CHANGES
> - +1: rjung, jailletc36, trawick
Regards,
Rainer