1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

168 Commits

Author SHA1 Message Date
Jim Jagielski
a2649df81b Merge r1705983 from trunk:
Fix some style issues on files that can easily be synch'ed with 2.4.x
Submitted by: jailletc36
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707037 13f79535-47bb-0310-9956-ffa450edef68
2015-10-06 12:36:36 +00:00
Daniel Gruno
1f8901d5c1 Backport r1706533 to 2.4: Turn 5.1/5.2 order upside down, simplify. This should also (AFAIK) work with Ubuntu/Debian, which has previously been known to fail to compile mod_lua.so
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706534 13f79535-47bb-0310-9956-ffa450edef68
2015-10-03 09:47:27 +00:00
Jim Jagielski
4fdd165830 Merge r1703417, r1703642 from trunk:
Add in finding LUA installed via Macports and others


accept both 5.1 and 5.2, so make messages clear

Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703650 13f79535-47bb-0310-9956-ffa450edef68
2015-09-17 16:56:01 +00:00
Jan Kaluža
245cecccf7 * mod_lua: fix compilation with lua-5.3 (r1668827)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1668831 13f79535-47bb-0310-9956-ffa450edef68
2015-03-24 09:46:42 +00:00
Eric Covener
52dd3e5e00 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




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1664118 13f79535-47bb-0310-9956-ffa450edef68
2015-03-04 19:18:27 +00:00
Eric Covener
23e90b697e 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




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1664117 13f79535-47bb-0310-9956-ffa450edef68
2015-03-04 19:17:32 +00:00
Jim Jagielski
69eb3c6cfc Merge r1642499 from trunk:
*) SECURITY: CVE-2014-8109 (cve.mitre.org)
     mod_lua: Fix handling of the Require line when a LuaAuthzProvider is
     used in multiple Require directives with different arguments.
     PR57204 [Edward Lu <Chaosed0 gmail.com>]

Submitted By: Edward Lu
Committed By: covener


Submitted by: covener
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1642861 13f79535-47bb-0310-9956-ffa450edef68
2014-12-02 12:50:59 +00:00
Jim Jagielski
1f3956473e 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1622706 13f79535-47bb-0310-9956-ffa450edef68
2014-09-05 14:20:27 +00:00
Daniel Gruno
0b27b4944e backport for mod_lua: Don't quote values in cookies; Make IE happy again [#56734]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1611744 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 18:15:42 +00:00
Joe Orton
4bbf0508ea 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1610499 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 19:55:04 +00:00
Daniel Gruno
8791c40737 mod_lua backport: Make httpd find lua 5.2 headers/lib during configure if present on the system (mod_lua is fully compatible with 5.2).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1605276 13f79535-47bb-0310-9956-ffa450edef68
2014-06-25 06:41:09 +00:00
Jeff Trawick
e1c0c77fb9 Merge r1604631 from trunk:
Follow up to r1604336: Comment out hooks whose only references are
now commented out, fixing a "-Wunused-function" warning


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604633 13f79535-47bb-0310-9956-ffa450edef68
2014-06-22 18:16:21 +00:00
Daniel Gruno
1bd684d69c mod_lua: Backport disabling of early/late in LuaHookCheckUserID
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604340 13f79535-47bb-0310-9956-ffa450edef68
2014-06-21 11:21:04 +00:00
Daniel Gruno
84be129a85 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)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604339 13f79535-47bb-0310-9956-ffa450edef68
2014-06-21 11:19:40 +00:00
Daniel Gruno
10f596b210 C89 and such
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1589430 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 14:42:18 +00:00
Daniel Gruno
a7426b2cb7 fix lua_ap_requestbody (bad backport?)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1588915 13f79535-47bb-0310-9956-ffa450edef68
2014-04-21 16:23:32 +00:00
Daniel Gruno
b35526d5e2 Backport r1588807
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1588808 13f79535-47bb-0310-9956-ffa450edef68
2014-04-20 17:56:41 +00:00
Daniel Gruno
01785993ed mod_lua: backport the two parsebody fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1588762 13f79535-47bb-0310-9956-ffa450edef68
2014-04-20 14:02:22 +00:00
Daniel Gruno
707e187891 mod_lua: Give me all the backports and eggs you have. (see CHANGES)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1582968 13f79535-47bb-0310-9956-ffa450edef68
2014-03-29 09:15:33 +00:00
Daniel Gruno
1486d67e26 mod_lua: Prevent HTTP Response Splitting by not allowing tables in the request_rec to be set with values containing newlines.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1582264 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 11:22:33 +00:00
Daniel Gruno
7ed8b01180 mod_lua: escape key/value pairs when setting cookies to prevent header splitting with tainted cookies.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1582255 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 11:00:34 +00:00
Daniel Gruno
1b61caf3b9 mod_lua: Reformat and escape script error output.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1582251 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 10:47:35 +00:00
Daniel Gruno
e2d90903ab mod_lua: backport r1578870+r1578882 and add to change log.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1578964 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 17:02:47 +00:00
Daniel Gruno
31b2c080a0 mod_lua: Add a fixups hook that checks if the original request is intended
for LuaMapHandler. This fixes a bug where FallbackResource invalidates the 
LuaMapHandler directive in certain cases by changing the URI before the map 
handler code executes [Daniel Gruno].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1577145 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 12:55:53 +00:00
Guenter Knauf
e9e9c1d926 Fixed mod_lua NetWare build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575784 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 00:57:32 +00:00
Daniel Gruno
434da2ff36 Backport r1570528
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570530 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 11:13:53 +00:00
Daniel Gruno
f40cc3cab2 mod_lua: Backport setcookie changes. PR 56128
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570162 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 11:54:27 +00:00
Eric Covener
09bd7be2ae 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




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1567328 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 19:35:52 +00:00
Daniel Gruno
b508cd24d3 Backport r1564727: Fix support for uploading files by using pushlstring instead of pushstring when pushing binary data.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1564729 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 12:13:11 +00:00
Daniel Gruno
73d324a455 mod_lua: Detect "All" or "None" before putting together a potentially blank (or static) string.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1555070 13f79535-47bb-0310-9956-ffa450edef68
2014-01-03 12:20:13 +00:00
Graham Leggett
5eca70cf6f * easy proposals to synch 2.4.x and trunk
- log.c: avoid needless apr_pstrdup()
  - Use apr_pstrmemdup instead of apr_pstrndup when this is safe.
  - Use apr_pstrmemdup instead of apr_pstrndup when this is safe.
  - Remove redundant check
  - 'ap_getword_conf' does not return NULL but an empty string
  - Ease logic around 'ap_getword_conf' and drop useless line of code.
  - 'ap_getword_conf' can not return NULL
  - 'ap_getword_conf' can not return NULL
  - Remove redundant check (already performed the line before)
  - Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable
trunk patches:
  - https://svn.apache.org/viewvc?view=revision&revision=1532122
  - https://svn.apache.org/viewvc?view=revision&revision=1549676
  - https://svn.apache.org/viewvc?view=revision&revision=1549680
  - https://svn.apache.org/viewvc?view=revision&revision=1550651
  - https://svn.apache.org/viewvc?view=revision&revision=1551005
  - https://svn.apache.org/viewvc?view=revision&revision=1551009
  - https://svn.apache.org/viewvc?view=revision&revision=1551010
  - https://svn.apache.org/viewvc?view=revision&revision=1551011
  - https://svn.apache.org/viewvc?view=revision&revision=1551012
  - https://svn.apache.org/viewvc?view=revision&revision=1551013
2.4.x patches: trunk patches work
               http://people.apache.org/~jim/patches/ez-2.4-v2.patch
+1: jailletc36, jim, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1553532 13f79535-47bb-0310-9956-ffa450edef68
2013-12-26 18:08:28 +00:00
Eric Covener
b433a30ee5 Merge r1551968 from trunk:
get arpa/inet.h from apr_want.h for htons where applicable




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1551969 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 15:03:19 +00:00
Jim Jagielski
4bea5d7adc 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1546976 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 12:18:19 +00:00
Gregg Lewis Smith
a55e272eaa merge r1529277 from trunk
WebSocket support requires Winsock2



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1529278 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 20:07:57 +00:00
Daniel Gruno
6f55ec2af0 backport mod_lua changes(r1524321): check for big endian and don't fiddle with bits if so.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1524328 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 08:08:58 +00:00
Daniel Gruno
f41d8a48ea Backport a few things in mod_lua:
- Fix filters
- Add setcookie/getcookie
- Add preliminary WebSocket support
- Update documentation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1523974 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 10:38:12 +00:00
Graham Leggett
ef694d32a6 modules: Fix some compiler warnings.
trunk patch: http://svn.apache.org/r1500345
             http://svn.apache.org/r1500362
             http://svn.apache.org/r1500423
             http://svn.apache.org/r1500483
             http://svn.apache.org/r1500519

Submitted by: fuankg
Reviewed by: jim, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1523259 13f79535-47bb-0310-9956-ffa450edef68
2013-09-14 14:44:23 +00:00
Guenter Knauf
7b7138e5aa Removed comment which should never have been committed.
(thanks Eric!)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1519285 13f79535-47bb-0310-9956-ffa450edef68
2013-09-01 15:37:41 +00:00
Rainer Jung
1eab8000fb Remove line added during the trunk sync in
r1491468. The line never was part of trunk.
CTR (mod_lua).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1497649 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 05:45:47 +00:00
Guenter Knauf
f0c944f49a Added new r:touch() function; updated docs.
(Backport r1495270, r1495665, r1495666)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1496483 13f79535-47bb-0310-9956-ffa450edef68
2013-06-25 14:19:51 +00:00
Guenter Knauf
7c2097147b mod_lua: Fully sync 2.4.x with trunk (catch up to r1490700).
Added missing files from commit r1491468.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1491913 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 19:18:33 +00:00
Graham Leggett
378f774ab1 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1491468 13f79535-47bb-0310-9956-ffa450edef68
2013-06-10 14:36:56 +00:00
Graham Leggett
04bd9d4b2f mod_lua: Sync 2.4 branch with trunk. This includes (but is not limited to)
Server pools, new apr functions for the request_rec table, input/output filters,
LuaCodeCache, LuaMapHandler and multipart form data handling. This is long
overdue, and has become too spaghetti-ish to propose in chunks :|

trunk patch: http://svn.apache.org/r1366890
             http://svn.apache.org/r1367025
             http://svn.apache.org/r1367040
             http://svn.apache.org/r1367048
             http://svn.apache.org/r1383024
             http://svn.apache.org/r1383028
             http://svn.apache.org/r1383037
             http://svn.apache.org/r1367725
             http://svn.apache.org/r1367875
             http://svn.apache.org/r1368109
             http://svn.apache.org/r1369656
             http://svn.apache.org/r1369793
             http://svn.apache.org/r1369800
             http://svn.apache.org/r1370158
             http://svn.apache.org/r1433967
             http://svn.apache.org/r1429169
             http://svn.apache.org/r1425450
             http://svn.apache.org/r1425243
             http://svn.apache.org/r1422552
             http://svn.apache.org/r1422548
             http://svn.apache.org/r1422531
             http://svn.apache.org/r1422373
             http://svn.apache.org/r1422072
             http://svn.apache.org/r1421784
             http://svn.apache.org/r1421780
             (the list goes on...)
    2.4.x patch: http://www.humbedooh.com/mod_lua_sync.patch (+CHANGES)

Submitted by: humbedooh
Reviewed by: jim, covener, fuankg


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1490599 13f79535-47bb-0310-9956-ffa450edef68
2013-06-07 11:51:28 +00:00
Daniel Gruno
a5f73bf85b backported r1439208 to 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1441739 13f79535-47bb-0310-9956-ffa450edef68
2013-02-02 12:20:02 +00:00
Guenter Knauf
be833c1bd3 Added missing part of incomplete backport r1439099.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1439357 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 11:56:09 +00:00
Daniel Gruno
598ad844a2 Backport lua dbd bindings to 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1439099 13f79535-47bb-0310-9956-ffa450edef68
2013-01-27 15:31:45 +00:00
Jim Jagielski
f2965a43de Merge r1397687 from trunk:
configure: Fix processing of --disable-FEATURE for various features.

Submitted by: trawick
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1430949 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 16:39:05 +00:00
Jim Jagielski
32bf896e8f backport r1385216, r1387610 from trunk:
Spin off module-specific build options into separate build vars.
[second try, supersedes r1385214]

Add MOD_CFLAGS, MOD_LDFLAGS variables etc. to the build commands,
which are available to modules for customization on a per-subdir
basis (by adding definitions to modules.mk). Reduces the risk
of side-effects when a module needs to add CFLAGS, LDFLAGS etc.
and these would be added to the global settings (ALL_CFLAGS etc.).

Adapt build settings for mod_ssl, mod_socache_dc, mod_deflate,
mod_xml2enc, mod_proxy_html, and mod_lua to use the new MOD_xxx
build variables.

Change PICFLAGS, SHLTCFLAGS and LTCFLAGS into config vars, instead
of AC_SUBSTing them in build/rules.mk.in. For support/ab, introduce
ab_CFLAGS and ab_LDFLAGS, and define explicit make targets where
they appear at the proper position in the build commands.

Consistently use "--with-xxx=PATH" in configure help strings which
are used to specify a path to the installation directory of an
auxiliary package.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390518 13f79535-47bb-0310-9956-ffa450edef68
2012-09-26 14:30:31 +00:00
Jim Jagielski
30ed35311d Merge r1351020, r1370466 from trunk:
Add new directive LuaAuthzProvider to allow implementing an
authorization provider in lua


There is only one global provider name space, therefore allow
LuaAuthzProvider only in global scope.

Remove unnecessary server config field.

Submitted by: sf
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1374252 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 13:45:22 +00:00
Jim Jagielski
2071a9f888 Merge r1361801 from trunk:
Various code clean up

Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
PR: 52893 

Submitted by: sf
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1373092 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 20:57:43 +00:00