www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-10 02:02:49 +03:00
Code Activity
29,480 Commits 62 Branches 304 Tags
cc97ce3e52770d69c6de9aa7f2be85fae69509f7
Commit Graph

133 Commits

Author SHA1 Message Date
Jim Jagielski
cc97ce3e52 https://bz.apache.org/bugzilla/show_bug.cgi?id=58855 
Optimize check for empty strings


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778067 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-09 22:08:01 +00:00
Rainer Jung
f439615d29 Fix typo in comment (s/patterm/pattern/). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1726086 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-21 20:13:58 +00:00
Rainer Jung
0eddea67ac Added some more log numbers to log statements that 
had none.

Those were not detected by the coccinelle script.
Only a few hard cases are remaining now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725548 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-19 15:43:17 +00:00
Rainer Jung
af14d158a3 Added many log numbers to log statements that 
had none.

Those were not detected by the coccinelle script.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725485 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-19 12:02:41 +00:00
Rainer Jung
44ce30494e Added many log numbers to log statements that 
had none.

Handled all files in modules/.

I used the coccinelle script provided by Stefan.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725392 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-19 00:03:18 +00:00
Eric Covener
6c0cf71485 followup to r1657261 whitespace only -- reindent body of while loop. 
(no change under svn diff -x-w)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657263 13f79535-47bb-0310-9956-ffa450edef68
 2015-02-04 14:52:50 +00:00
Eric Covener
78eb3b9235 *) 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/trunk@1657261 13f79535-47bb-0310-9956-ffa450edef68
 2015-02-04 14:44:23 +00:00
Eric Covener
8f40799093 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/trunk@1657256 13f79535-47bb-0310-9956-ffa450edef68
 2015-02-04 14:33:51 +00:00
Daniel Gruno
8216b3d0b4 mod_lua: Initial attempt at passing on the configuration tree to Lua. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1641661 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-25 18:04:00 +00:00
Rainer Jung
118e19314d Switch from lua_objlen() to Lua 5.2 preferred 
lua_rawlen(). Define lua_rawlen() in terms of
lua_objlen() when building against older Lua.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1612552 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 11:57:06 +00:00
Christophe Jaillet
56d0c25725 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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1612068 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-20 09:32:58 +00:00
Daniel Gruno
2c676c90ee mod_lua: Don't quote values in cookies; Make IE happy again [#56734] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1611741 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 18:12:12 +00:00
Joe Orton
b2605d20c4 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/trunk@1610491 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-14 19:26:00 +00:00
Jeff Trawick
06189fe5af back to c89 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1588989 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-21 21:31:42 +00:00
Daniel Gruno
3a7ef57c8d mod_lua: stop complaining 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1588807 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-20 17:56:10 +00:00
Daniel Gruno
e1f073ca56 mod_lua: Use binary strstr for finding endpoints of a multipart object. (How did this EVER work?! *sigh*) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1588761 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-20 13:58:13 +00:00
Daniel Gruno
d38e1b6e83 mod_lua: Redesign the table construction/access mechanism, so we pass on a struct with the request_rec, the table pointer and the table name instead of just the table pointer. This allows us to use the request_rec for logging/editing purposes, as well as inform the user which exact table in the request_rec was modified. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1582858 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 18:38:41 +00:00
Daniel Gruno
2514105ae4 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/trunk@1582253 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-27 10:58:35 +00:00
Daniel Gruno
9dcfbbf7d4 this wasn't supposed to be a pointer, thanks Yann! 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572748 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 21:56:59 +00:00
Daniel Gruno
78f93a7569 Remove bad line that snuck into the commit 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572704 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 19:11:54 +00:00
Daniel Gruno
760d584e2b mod_lua: Only read up to whatever the user defines as max size when using r:parsebody() - if content length is greater, return an error. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572703 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 19:10:55 +00:00
Daniel Gruno
c92f2cf0ad mod_lua: Add r:wspeek for checking if data is available to be read. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1570208 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 14:46:38 +00:00
Daniel Gruno
e3b43089d8 mod_lua: Slight null-check fix on setcookie. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1570156 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 11:47:47 +00:00
Daniel Gruno
1d91506913 use err_headers_out for setting cookies instead of headers_out, so they persist on non-2xx/3xx statuses (Thanks to Joe Schaefer for this) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1567434 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-11 22:51:20 +00:00
Daniel Gruno
5ed3e10473 mod_lua: Upgrade r:setcookie to accept a table of arguments, and add domain, path and HttpOnly to the list of options available for setting. PR 56128 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1567430 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-11 22:45:32 +00:00
Eric Covener
92be81f133 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/trunk@1567221 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-11 16:57:07 +00:00
Daniel Gruno
40c8487150 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/trunk@1564727 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-05 12:04:14 +00:00
Daniel Gruno
1ae03d3bcc 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/trunk@1555063 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-03 12:09:04 +00:00
Eric Covener
c3e08f9469 get arpa/inet.h from apr_want.h for htons where applicable 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551968 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-18 15:02:43 +00:00
Rainer Jung
dc0ff62b76 mod_lua: Fix compiler warning by using correct 
APR_SIZE_T_FMT and APR_OFF_T_FMT format macro
in debug logging.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1544820 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-23 15:45:31 +00:00
Jeff Trawick
b374da81a4 apr_file_write_full() simplification (like r1542413 and r1542416) 
hopefully I sidestepped the surprising conflation of OK/APR_SUCCESS
in this code


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542493 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-16 12:13:39 +00:00
Daniel Gruno
5a2ba0a377 mod_lua: Use a (new) global pool/mutex setup for IVM rather than a per-process pool. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1526906 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-27 13:56:53 +00:00
Daniel Gruno
e9ed2c0311 mod_lua: ap_ntoh64 endianess test 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1524321 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-18 07:48:22 +00:00
Daniel Gruno
5929a20fe0 mod_lua: Figure out a way to read from SSL connections with WebSockets. Brigades ain't my strong side, so if someone could adjust it a bit, that'd be swell. It _works_, but I'm sure it could be improved upon. Also make r:wsclose() work properly with SSL. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1523432 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-15 12:47:50 +00:00
Guenter Knauf
69637dff7d Use APR type; rename var. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1523211 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-14 11:05:05 +00:00
Guenter Knauf
7c12fd500b Fixed ap_ntoh64 argument. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1523207 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-14 10:55:10 +00:00
Daniel Gruno
731d18dd4c mod_lua: Add rudimentary WebSocket support. This is a WIP (emphasis on the W, I and P) and subject to change as the idea surrounding it evolves into something meaningful. But for now, WebSockets, yay! Please do review this! 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1522030 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-11 20:50:46 +00:00
Daniel Gruno
478d3dc36e mod_lua: init cookie as NULL. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520256 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-05 08:59:10 +00:00
Daniel Gruno
63c46e2f6b remove an unneeded variable I just added, oops. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520250 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-05 08:24:29 +00:00
Daniel Gruno
a952d5663d mod_lua: Use ap_cookie_read for reading cookie values, since it's already there. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520248 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-05 08:23:05 +00:00
Daniel Gruno
38024c1665 Add r:setcookie(key, val, secure, expires) and r:getcookie(key) to the request_rec table. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519977 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-04 10:47:46 +00:00
Guenter Knauf
3b905a6fb4 Fix some compiler warnings. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1500362 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-07 03:12:52 +00:00
Guenter Knauf
35012f8883 Added new r:touch() function. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1495270 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-21 01:51:45 +00:00
Guenter Knauf
0a910d8c16 Added new function r.date_parse_rfc() to mod_lua. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1489400 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 12:12:14 +00:00
Guenter Knauf
98d56029a0 Fixed crash condition when r.module_info() is called 
for modules which dont have directives.
Bug found and fix submitted by gsmith, slightly modified by fuankg.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1489199 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 22:05:07 +00:00
Guenter Knauf
5982f16da7 Added new functions r:mkdir(), r:mkrdir(), r:rmdir() to mod_lua. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1488981 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 13:02:46 +00:00
Guenter Knauf
5dbd3677fd Added new function r:htpassword() to mod_lua. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1488773 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-02 19:31:16 +00:00
Guenter Knauf
069bd372bc Added optional parameter wanted to r:stat(). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1488480 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 07:47:29 +00:00
Guenter Knauf
57c76a11bb cosmetics. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1488115 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 07:05:03 +00:00
Guenter Knauf
4e7640be1d Remove unneeded exports from mod_lua. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487956 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 18:28:24 +00:00