Checkout Tools
  • last updated 12 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Support IPv6-sized client strings in mod_status and mod_echo

trunk: http://svn.apache.org/r1837225

http://svn.apache.org/r1837366

2.4.x patch: http://home.apache.org/~jim/patches/client64v2.patch

+1: jim, icing (by inspection), minfrin

  1. … 7 more files in changeset.
Fix comment in mod_lua and docs.

s/addoutputfilter/add_output_filter/

See PR 62359

(r1837404 on trunk)

Note: .c file is patch without any vote because it is only a comment in order to be consistent with the doc and the code, and mod_lua is marked as experimental.

  1. … 1 more file in changeset.
mod_lua: Improve compatibility with Lua 5.1, 5.2 and 5.3.

PR58188, PR60831, PR61245.

CTR

The following lua 5.2 and 5.3 compat change

should be checked for runtime correctness

by someone more knowledgeable about lua.

Index: modules/lua/lua_apr.c

--- modules/lua/lua_apr.c (original)

+++ modules/lua/lua_apr.c Tue Jul 4 20:48:43 2017

@@ -82,7 +82,11 @@ static const luaL_Reg lua_table_methods[

int ap_lua_init(lua_State *L, apr_pool_t *p)

{

luaL_newmetatable(L, "Apr.Table");

+#if LUA_VERSION_NUM < 502

luaL_register(L, "apr_table", lua_table_methods);

+#else

+ luaL_newlib(L, lua_table_methods);

+#endif

lua_pushstring(L, "__index");

lua_pushstring(L, "get");

lua_gettable(L, 2);

  1. … 8 more files in changeset.
Backport of Lua exhancements from trunk, mostly to support 5.3
  1. … 9 more files in changeset.
Merge r1725485 from trunk:

Added many log numbers to log statements that

had none.

Those were not detected by the coccinelle script.

Submitted by: rjung

Reviewed/backported by: jim

  1. … 34 more files in changeset.
Add APLOGNO, first chunk (those that were

detected by coccinelle).

There are some more but they are easier to

backport once these here are applied.

Backport of r1725392, r1725394, r1725395

and r1725468 from trunk.

Submitted by: rjung

Reviewed by: jim, ylavic

  1. … 38 more files in changeset.
Fix typo in comment (s/patterm/pattern/).

Backport of r1726086 from trunk.

  1. … 2 more files in changeset.
Merge r1657261 from trunk:

*) SECURITY: CVE-2015-0228 (cve.mitre.org)

mod_lua: A maliciously crafted websockets PING after a script

calls r:wsupgrade() can cause a child process crash.

[Edward Lu <Chaosed0 gmail.com>]

Discovered by Guido Vranken <guidovranken gmail.com>

Submitted by: Edward Lu

Committed by: covener

  1. … 3 more files in changeset.
Merge r1657256 from trunk:

Fix bit-shifting of websockets frame fields that would yield wrong opcodes

when the FIN bit was set. Results in PING not being recognized

by mod_lua. PR57524

Submitted By: Edward Lu

Committed By: covener

  1. … 2 more files in changeset.
Merge r1611978, r1612068 from trunk:

Add missing APLOGNO.

Refactor to keep APLOGNO on the same line as ap_log_error, when applicable.

Add missing APLOGNO.

Refactor some lines to keep APLOGNO on the same line as ap_log_error, when applicable.

Split lines longer than 80.

Improve alignment.

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 18 more files in changeset.
backport for mod_lua: Don't quote values in cookies; Make IE happy again [#56734]
  1. … 1 more file in changeset.
Merge 1610491 from trunk:

SECURITY (CVE-2014-0226): Fix a race condition in scoreboard handling,

which could lead to a heap buffer overflow. Thanks to Marek Kroemeke

working with HP's Zero Day Initiative for reporting this.

* include/scoreboard.h: Add ap_copy_scoreboard_worker.

* server/scoreboard.c (ap_copy_scoreboard_worker): New function.

* modules/generators/mod_status.c (status_handler): Use it.

* modules/lua/lua_request.c (lua_ap_scoreboard_worker): Likewise.

Reviewed by: trawick, jorton, covener, jim

Submitted by: jorton, covener

  1. … 6 more files in changeset.
mod_lua: Sync 2.4.x with trunk (more or less); Backport a fix and some code harmonization:

- IVM changed to use shm

- More verbose error logging (no functional change)

- Miscellaneous refactoring that was in trunk but not in 2.4.x (no functional change as such)

  1. … 2 more files in changeset.
C89 and such
fix lua_ap_requestbody (bad backport?)
Backport r1588807
mod_lua: backport the two parsebody fixes.
mod_lua: Give me all the backports and eggs you have. (see CHANGES)
  1. … 4 more files in changeset.
mod_lua: escape key/value pairs when setting cookies to prevent header splitting with tainted cookies.
  1. … 1 more file in changeset.
mod_lua: Backport setcookie changes. PR 56128
  1. … 2 more files in changeset.
Merge r1567221 from trunk:

mod_lua: Fix r:setcookie() to add, rather than replace,

the Set-Cookie header. PR56105

Submitted By: Kevin J Walters <kjw ms com>, Edward Lu <Chaosed0 gmail com>

Committed By: covener

  1. … 1 more file in changeset.
Backport r1564727: Fix support for uploading files by using pushlstring instead of pushstring when pushing binary data.
  1. … 1 more file in changeset.
mod_lua: Detect "All" or "None" before putting together a potentially blank (or static) string.
Merge r1551968 from trunk:

get arpa/inet.h from apr_want.h for htons where applicable

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.

  1. … 2 more files in changeset.
backport mod_lua changes(r1524321): check for big endian and don't fiddle with bits if so.
Backport a few things in mod_lua:

- Fix filters

- Add setcookie/getcookie

- Add preliminary WebSocket support

- Update documentation

  1. … 2 more files in changeset.
  1. … 10 more files in changeset.
Added new r:touch() function; updated docs.

(Backport r1495270, r1495665, r1495666)

  1. … 2 more files in changeset.
mod_lua: Fully sync 2.4.x with trunk (catch up to r1490700):

2.4.x patch: http://www.humbedooh.com/mod_lua_2013_06_07.patch

Submitted by: humbedooh

Reviewed by: fuankg, minfrin

  1. … 16 more files in changeset.