1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Commit Graph

281 Commits

Author SHA1 Message Date
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
Gregg Lewis Smith
bd643bdfb6 WebSocket support requires Winsock2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529277 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 20:03:50 +00:00
Daniel Gruno
85e297e619 Axe the README a bit, add fuankg as contributor. This will need a complete rewrite at some point.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1527172 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 11:11:14 +00:00
Eric Covener
a8ad7b0e63 r1526906 followup:
error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1527063 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 20:30:47 +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
83ead14410 Fixed mod_lua NetWare build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1523208 13f79535-47bb-0310-9956-ffa450edef68
2013-09-14 10:55:53 +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
Eric Covener
227ffd6486 mod_lua: If the first yield() of a LuaOutputFilter returns a string, it should
be prefixed to the response as documented.

Also, don't put empty heap buckets in the brigade if a yield() is called with 
no string.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519492 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 18:38:07 +00:00
Eric Covener
8582560883 mod_lua: Remove ETAG, Content-Length, and Content-MD5 when a LuaOutputFilter
is configured without mod_filter. [Eric Covener]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519483 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 17:45:40 +00:00
Eric Covener
bc12f5ca71 register LuaOutputFilters with AP_FILTER_PROTO_CHANGE|AP_FILTER_PROTO_CHANGE_LENGTH
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519476 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 17:06:16 +00:00
Eric Covener
d7aa057282 Return a 500 error instead of DECLINED when LuaHook* script does not
return a numeric value.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519398 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 11:43:53 +00:00
Eric Covener
20996af3ee trace4 logging of return codes from LuaHook* functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519329 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 01:21:39 +00:00
Guenter Knauf
d9ff913363 Removed comment which should never have been committed.
(thanks Eric!)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519285 13f79535-47bb-0310-9956-ffa450edef68
2013-09-01 15:37:41 +00:00
Daniel Gruno
1ad63fbb73 Adding a simple logging hook for mod_lua, which allows users to create their own logs or bypass the generic logging on a per-request basis.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519277 13f79535-47bb-0310-9956-ffa450edef68
2013-09-01 15:10:32 +00:00
Eric Covener
0b20132add remove c++ comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519188 13f79535-47bb-0310-9956-ffa450edef68
2013-08-31 16:02:15 +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
51cd620292 Return with error if we dont support an algorithm.
Modified error message slightly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1490531 13f79535-47bb-0310-9956-ffa450edef68
2013-06-07 08:08:55 +00:00
Ruediger Pluem
3777092d33 * truncpw was allocated from a pool and not via malloc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1490290 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 14:03:28 +00:00
Eric Covener
a43dd91645 tolerate LuaMapHandler scripts that don't return anything
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1490098 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 01:04:17 +00:00
Guenter Knauf
2deddb79ae Follow-up to r1488773 for configure builds.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1489410 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 12:27:24 +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
586e050124 Remove unneeded exports from mod_lua - part 2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1488114 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 07:03:15 +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
Guenter Knauf
7557b6066f Provide proper module extension.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487769 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 06:58:19 +00:00
Guenter Knauf
ec3b92de78 Removed non-existent funcions from header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487710 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 02:43:03 +00:00
Guenter Knauf
463a796ddc Removed non-existent funcion from header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487706 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 02:03:09 +00:00
Guenter Knauf
095a44ecdc Use proper type to kill compiler warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1486538 13f79535-47bb-0310-9956-ffa450edef68
2013-05-27 08:26:33 +00:00
Guenter Knauf
750cf0b5f5 Whoops - one empty line too much.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1486269 13f79535-47bb-0310-9956-ffa450edef68
2013-05-25 01:14:45 +00:00
Guenter Knauf
b5d55cf99d Removed a bunch of empty lines.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1486266 13f79535-47bb-0310-9956-ffa450edef68
2013-05-25 00:59:12 +00:00
Guenter Knauf
3406c33bfb Changed r.sleep(s) to r.usleep(ms).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1486265 13f79535-47bb-0310-9956-ffa450edef68
2013-05-25 00:56:22 +00:00
Guenter Knauf
e71d636f79 Removed obsolete define (already exists in mod_lua.h).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1485292 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 17:19:47 +00:00
Guenter Knauf
8d09295d46 Removed obsolete header include.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1485291 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 17:18:20 +00:00
Guenter Knauf
2acdfd8ff0 Cast uint16 return value to int.
This fixes a crash on Windows when compiled with MSVC9.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483348 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 13:18:48 +00:00
Guenter Knauf
530d55cf3b Fixed Lua type.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483343 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 13:11:20 +00:00
Guenter Knauf
0b3f100b46 Fixed compiler warning; sorted includes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483334 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 13:00:48 +00:00
Guenter Knauf
debb1f9e57 Moved header protection to the top.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483325 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 12:49:16 +00:00