www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Code Activity
26,790 Commits 62 Branches 306 Tags
25a2e41ea7e474100375986de0a0d792ff8094de
Commit Graph

336 Commits

Author SHA1 Message Date
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
Christophe Jaillet
8f1c51a9f6 Typo in comment 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483044 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-15 19:39:16 +00:00
Guenter Knauf
f14a0017a6 Revert part of r1476482 which disabled fractions of seconds with r.sleep(). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1480871 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 03:37:06 +00:00
Rainer Jung
10423926d0 lua header update part 1: EDOESNOTBUILD. 
First include mod_lua which sets LUA_COMPAT_ALL,
then lua.h which uses it.

Needed at least to build with lua 5.2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1479718 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-06 23:23:43 +00:00
Guenter Knauf
804c2032a7 Fixed the base64 functions. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1476785 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-28 14:59:46 +00:00
Guenter Knauf
8f652c1b74 Added function to get all entries of a directory. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1476601 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 15:26:08 +00:00
Guenter Knauf
f231cd4e08 Reduce compiler warnings. 
Fixed some types, added casts, or changed to proper function.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1476482 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 03:23:55 +00:00
Guenter Knauf
bda0a282fe Fixed r.started value to return seconds. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1470157 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-20 12:32:08 +00:00
Daniel Gruno
98ebff29d7 Use a mutex to control read/write for IVM values, so we can reuse the existing structures without running into race conditions. 
This should get rid of the need to have MaxConnectionsPerChild set to > 0.

If a new value is set and is a string, we either use the existing varbuf or grow it accordingly.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1470156 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-20 12:26:05 +00:00
Daniel Gruno
35f9ad9165 use ap_varbuf instead of allocating new strings each time we override an old one. 
This uses leaks less memory, but it's still not perfect (but it's a start - maybe I need to use a mutex for this, to override the original object without running into race conditions)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1470155 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-20 11:20:22 +00:00
Daniel Gruno
9f39d246e8 r.started already exists as a built in variable, so let's not make it a function as well. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1470117 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-20 07:18:23 +00:00
Daniel Gruno
5d652f66ec exists_config_define should return a boolean, not a number, or it will always evaluate to true. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1469844 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-19 14:28:25 +00:00
Daniel Gruno
a433e37ec8 remove redundant code 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1469751 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-19 09:04:52 +00:00
Daniel Gruno
8049067196 Remove lua_ap_banner, as it's no longer being used. 
Add ivm_get/ivm_set for Inter-VM data transfer. This allows multiple VMs across a process to share data without having to resort to external databases or filesystems. This is a work in progress, and I have yet to work out a proper way of resetting a variable without causing a memory leak (this could be done by allocating a new pool for each object, but I'm trying to see if there's a more efficient way). Comments, ideas etc are most welcome.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1469744 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-19 08:46:28 +00:00
Guenter Knauf
b8fc4783c7 Only ask for the stat info we really use. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1467822 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-14 20:03:07 +00:00
Guenter Knauf
abc30cfcd9 Return early with an error instead of returning an incomplete match table. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1467721 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-14 02:53:36 +00:00
Guenter Knauf
0e18686c12 Whoops, one AP_MAX_REG_MATCH not caught. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1467719 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-14 02:50:19 +00:00
Guenter Knauf
97e8153a9c Decouple mod_lua max regex matches from AP_MAX_REG_MATCH. 
Bumped the default to 25 matches; this default can be
overwritten with a CLFAGS define.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1467718 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-14 02:36:23 +00:00
Daniel Gruno
e1ae43e3ab silly me 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1467572 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-13 07:45:09 +00:00
Daniel Gruno
336d9f37ef fix some bugs reported by fuankg on Windows release builds. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1467571 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-13 07:40:42 +00:00
Daniel Gruno
06014240dc fix up r.banner and r.port so they work like variables and not functions (seems to have already been put in there), duplicate?? 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1467558 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-13 06:33:07 +00:00
Daniel Gruno
df8901ec7b fix docs on regex matching, change the actual ordering of arguments to match the docs, and enforce AP_MAX_REG_MATCH in the function, should it somehow return more matches than we have allocated 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1467557 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-13 06:24:11 +00:00
Guenter Knauf
160cff8b27 MOdified r:stat() to return finer time granularity. 
the atime, mtime, ctime, size values ar now in mod_lua
64bit as received from apr_stat().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1467427 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-12 19:15:39 +00:00
Guenter Knauf
07142dbd92 Fixed typo; followup to r1467188. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1467409 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-12 18:45:46 +00:00
Guenter Knauf
b610081619 Added optional parameter flags to lua_ap_regex(). 
This enables to call r:regex() with a flag to do
case-insensitive matches.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1467188 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-12 07:29:56 +00:00
Guenter Knauf
acf05d4ee7 Increased stacksize for mod_lua on NetWare. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1467186 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-12 07:25:18 +00:00
Guenter Knauf
29b9f3f42c Fixed Lua r:stat() time values. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1466743 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-11 00:19:30 +00:00
Daniel Gruno
2aa8e5eb40 r:regex was not returning the last captured group, as we were one off on how many captures to push to the table. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1445609 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-13 14:02:43 +00:00
Daniel Gruno
6360d96287 apr dbd and mod dbd have been mixed up in the handle closing function, so let's sort it out. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1439208 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-27 23:26:43 +00:00
Daniel Gruno
89d818870d If r:regex does not match, only return 'false', don't try to create error messages, because there should not be any - it's either match or no match here at this point. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1434065 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-16 18:00:04 +00:00
Daniel Gruno
49fcd96e73 Using the traditional way of declaring Lua functions does not seem to work with NetWare (and possibly Windows too?) 
Thus, at least until we find a smarter way, we have to move the r:* functions into lua_request.c and connect them from there.
The only functional change is that the transferred functions are now called through the request object instead of the apache2 package.
The distinction between what merited it to be in either structure seems very vague, so for now, we'll keep the HTTP return codes in the apache2 table, and the request/server functions in the request object.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1433967 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-16 14:52:52 +00:00
Daniel Gruno
234523fdca The pool and db object to be used should be created before trying to acquire a driver handle. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1432892 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 12:04:38 +00:00
Daniel Gruno
05bcfb46bb revert r1432881 - t'wasn't a bug after all. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1432886 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 11:42:28 +00:00
Daniel Gruno
3c72b3caf0 mod_lua/dbd: Only 2 arguments are passed, so let's tell Lua to only return 2, not 3. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1432881 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 11:37:09 +00:00
Daniel Gruno
4a2c2abb46 Shamelessly add some people to the contributors list (I hope they're okay with that) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1432422 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-12 13:25:40 +00:00
Daniel Gruno
4bf09168ad This stuff is now in trunk. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1432421 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-12 13:24:15 +00:00
Daniel Gruno
ba7f623fe7 Debian doesn't like pushing statically defined functions into tables, so we'll declare them in lua_dbd.h and just make them regular functions instead. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1432418 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-12 12:58:31 +00:00
Daniel Gruno
60e2bf1f47 Since functions are now pushed solely in lua_dbd.c, there's no need to declare them in lua_dbd.h 
Hopefully, this solves the Windows compiler issues.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1431930 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-11 08:13:28 +00:00
Gregg Lewis Smith
f6551d49f0 inform compiler where mod_dbd.h is located 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1431681 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-10 21:53:50 +00:00
Guenter Knauf
cff3f7fec1 Added include path for mod_dbd.h. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1431322 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-10 12:41:13 +00:00
Daniel Gruno
e582addb58 CodeWarrior workaround for lua_dbd 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1431236 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-10 09:47:30 +00:00
Daniel Gruno
27fc69424c Fix typo in comment, as per bugzilla #54388 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1430265 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-08 13:05:53 +00:00
Daniel Gruno
0e04ce5529 Add database features for mod_lua (apr_dbd + mod_dbd). 
See documentation update for API and examples.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1430225 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-08 11:42:50 +00:00
Stefan Fritsch
7deeb8782a fix typo: || not | 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1429169 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-04 23:48:15 +00:00
Daniel Gruno
3d8bdb7d7c Style tweaks, remove add_version_component and fix up some sloppy code. Many thanks to sfritsch for the pointers! 
And a merry christmas everyone :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1425450 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-23 10:28:16 +00:00
Daniel Gruno
1050577245 Style tweaks, no functional change. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1425243 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-22 05:25:50 +00:00