]>
granicus.if.org Git - apache/log
William A. Rowe Jr [Fri, 15 May 2009 17:46:29 +0000 (17:46 +0000)]
cleanup truncation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775257
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 May 2009 17:45:27 +0000 (17:45 +0000)]
Align internal names with external... Note, rename
of return to release for obvious reserved keyword
reasons :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775256
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 May 2009 17:41:56 +0000 (17:41 +0000)]
Another slotmem flag. This one determines if access
requires grab/return
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775255
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 15 May 2009 17:38:28 +0000 (17:38 +0000)]
Fix win32 build includes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775253
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 May 2009 16:07:43 +0000 (16:07 +0000)]
Remove all locking from slotmem_shm...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775209
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 May 2009 15:19:04 +0000 (15:19 +0000)]
Align with module naming
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775188
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 May 2009 15:16:16 +0000 (15:16 +0000)]
compile-time issues
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775186
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 May 2009 15:04:37 +0000 (15:04 +0000)]
Final ( :) ) step to transition which removes the ap_slotmem_foo
API and just does providers direct
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775176
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 May 2009 14:52:03 +0000 (14:52 +0000)]
Update doccos due to slotmem change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775169
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 May 2009 14:39:27 +0000 (14:39 +0000)]
Rename 2nd step
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775160
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 May 2009 14:37:10 +0000 (14:37 +0000)]
1st step of man changes for slotmem refactor
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775157
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 May 2009 14:31:38 +0000 (14:31 +0000)]
No longer used
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775154
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 May 2009 14:30:19 +0000 (14:30 +0000)]
No longer needed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775151
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 May 2009 14:25:18 +0000 (14:25 +0000)]
Finalize
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775149
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 May 2009 14:24:19 +0000 (14:24 +0000)]
Move over
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775148
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 May 2009 14:23:44 +0000 (14:23 +0000)]
Make new mem location
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775147
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 May 2009 14:17:34 +0000 (14:17 +0000)]
Rename of slotmem in transition away from ap_slotmem_ foo nis
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775145
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 15 May 2009 13:05:42 +0000 (13:05 +0000)]
Make the piped_log structure opaque:
* include/http_log.h: Remove piped_log structure definition here;
(ap_piped_log_read_fd, ap_piped_log_write_fd): Turn macros into
functions.
* server/log.c: Move piped_log structure definition here; replace
fds[2] with read_fd, write_fd.
(ap_piped_log_read_fd, ap_piped_log_write_fd): New functions.
(throughout...): Replace use of ap_piped_log_write_fd,
ap_piped_log_read_fd, with direct reference to structure fields.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775120
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Fri, 15 May 2009 06:20:01 +0000 (06:20 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775024
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Fri, 15 May 2009 06:19:17 +0000 (06:19 +0000)]
update for sync with English doc.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775023
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Fri, 15 May 2009 06:18:32 +0000 (06:18 +0000)]
fix module attribute
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775022
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 14 May 2009 19:21:57 +0000 (19:21 +0000)]
Revert second part of r774755.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774888
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 14 May 2009 19:13:17 +0000 (19:13 +0000)]
Revert r774755: ap_server_root_relative() for
piped loggers is nonsense. It doesn't work when
the logger path contains whitespace.
We already allow relative paths because we open
the log program via the shell.
Code was taken from mod_rewrite and mod_log_forensic,
which need to be still fixed (removing
ap_server_root_relative() should suffice).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774884
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 14 May 2009 14:20:47 +0000 (14:20 +0000)]
optimize as suggested by chrisd
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774778
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 14 May 2009 14:13:52 +0000 (14:13 +0000)]
unused var
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774774
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 14 May 2009 13:13:47 +0000 (13:13 +0000)]
docco xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774757
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 14 May 2009 12:59:25 +0000 (12:59 +0000)]
Allow relative pathnames for piped loggers in ErrorLog.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774755
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 14 May 2009 11:18:58 +0000 (11:18 +0000)]
Add name of program to spawn to the error
message, when starting piped loggers fails.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774730
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 14 May 2009 11:03:04 +0000 (11:03 +0000)]
Whitespace cleanup. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774728
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 14 May 2009 10:47:31 +0000 (10:47 +0000)]
Revert r735516 as requested by wrowe.
Will commit again as smaller patches,
also merging piped_log_wrapper with
the piped_log structure.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774725
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 13 May 2009 21:09:39 +0000 (21:09 +0000)]
revert 774533 until it becomes factual
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774536
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 13 May 2009 21:06:52 +0000 (21:06 +0000)]
use a single spelling of Multiviews
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774534
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 13 May 2009 21:06:29 +0000 (21:06 +0000)]
use a single spelling of Multiviews
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774533
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 13 May 2009 21:04:11 +0000 (21:04 +0000)]
mdc2 has expired
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774532
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Wed, 13 May 2009 20:59:33 +0000 (20:59 +0000)]
update comments and place in public domain
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774530
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 May 2009 19:44:56 +0000 (19:44 +0000)]
add API back from r774454
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774500
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 May 2009 19:21:44 +0000 (19:21 +0000)]
no need to recalc... we store this.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774498
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 May 2009 19:18:53 +0000 (19:18 +0000)]
Oops... not yet
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774497
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 May 2009 18:59:48 +0000 (18:59 +0000)]
off by 1 error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774493
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 May 2009 18:58:28 +0000 (18:58 +0000)]
Bounds check... id can't be >= number of slots (0 indexing)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774491
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 May 2009 18:34:19 +0000 (18:34 +0000)]
error detection
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774483
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 May 2009 18:27:04 +0000 (18:27 +0000)]
Add in draft grab/return (alloc/free)... not in API yet.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774473
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 May 2009 18:04:05 +0000 (18:04 +0000)]
ap_slotmem_mem no longer exists. We never provide the ptr to
the actual mem. Instead, we rely solely on getter/setter
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774454
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 May 2009 16:56:12 +0000 (16:56 +0000)]
standard method
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774428
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 May 2009 16:46:59 +0000 (16:46 +0000)]
Return APR_EGENERAL for the error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774423
13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Wed, 13 May 2009 15:27:05 +0000 (15:27 +0000)]
Allow the load balancing method to "create" workers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774400
13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Wed, 13 May 2009 06:55:57 +0000 (06:55 +0000)]
server_rec *r... Oops should be server_rec *s.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774239
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Wed, 13 May 2009 03:48:12 +0000 (03:48 +0000)]
sync with IANA as of 2009 May 12 16:30 PDT
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774184
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 13 May 2009 01:36:04 +0000 (01:36 +0000)]
Adds [NE] to the canonical hostname rules, as requested in
https://issues.apache.org/bugzilla/show_bug.cgi?id=47186
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774161
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 12 May 2009 22:54:04 +0000 (22:54 +0000)]
typo2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774121
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 12 May 2009 19:48:16 +0000 (19:48 +0000)]
The path is likely changing, in the meantime restore win32 build to success
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774048
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 12 May 2009 19:23:24 +0000 (19:23 +0000)]
fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774041
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 12 May 2009 19:15:08 +0000 (19:15 +0000)]
Optimization... for large slotmems, it would be useful to know
which ones are actually "in use"... So flag this. Need a way
to de-allocate a slot for completeness I think, but am having
a hard time coming up with a use case...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774036
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 12 May 2009 16:55:17 +0000 (16:55 +0000)]
If we have a mutex, we should use it whenever we create a
shared mem segment. This allows safe segment creation post
child-init
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@773977
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 12 May 2009 16:30:55 +0000 (16:30 +0000)]
- use apr_strerror() instead of strerror()
- log errno via param when using ap_log_*
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@773968
13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Tue, 12 May 2009 15:10:56 +0000 (15:10 +0000)]
Arrange the proxy_balancer_method:
- Put context back after the finder().
- Use server_rec as second parameter for reset() and age().
- Add the call for reset().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@773929
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 12 May 2009 04:10:19 +0000 (04:10 +0000)]
Address Win32 AcceptFilter documentation replacing DisableWin32AcceptEx
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@773774
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 10 May 2009 17:46:12 +0000 (17:46 +0000)]
mod_watchdog: mappers -> core forgotten in
Makefile.win.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@773372
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Sun, 10 May 2009 14:25:10 +0000 (14:25 +0000)]
Copy svn:ignore property from modules/mappers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@773343
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Sun, 10 May 2009 14:18:39 +0000 (14:18 +0000)]
* server/core.c (merge_core_dir_configs): Tweak logic and comment
wording in the special-case for Includes merging such that the code
and comment read the same. No functional change (intended!).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@773342
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 10 May 2009 14:03:36 +0000 (14:03 +0000)]
Switch two recent dsp files from CRLF to native
EOL style. All other dsp files are native
(though they should only matter on Windows).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@773341
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 10 May 2009 10:31:35 +0000 (10:31 +0000)]
* Fix for the following configuration where the exec command was disabled
in /subdir. All CVE-2009-1195 tests still pass with this patch.
# only two containers in the config
<Directory />
Options Includes
AllowOverride None
</Directory>
<Directory /subdir>
# with this container, mod_cgi/mod_cgid complains about exec being off
# without it, exec cmd= works as expected
SetEnv foo bar
</Directory>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@773322
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 8 May 2009 16:01:11 +0000 (16:01 +0000)]
* .gdbinit (dump_table): Dump pointer value of table entries,
sometimes useful.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@773039
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 8 May 2009 14:13:15 +0000 (14:13 +0000)]
Security fix for CVE-2009-1195: fix Options handling such that
'AllowOverride Options=IncludesNoExec' does not permit Includes with
exec= enabled to be configured in an .htaccess file:
* include/http_core.h: Change semantics of Includes/IncludeNoExec
options bits to be additive; OPT_INCLUDES now means SSI is enabled
without exec=. OPT_INCLUDES|OPT_INC_WITH_EXEC means SSI is enabled
with exec=.
* server/core.c (create_core_dir_config): Remove defunct OPT_INCNOEXEC
from default override_opts; no functional change.
(merge_core_dir_configs): Update logic to ensure that exec= is
disabled in a context where IncludesNoexec is configured, even if
Includes-with-exec is permitted in the inherited options set.
(set_allow_opts, set_options): Update to reflect new semantics
of OPT_INCLUDES, OPT_INC_WITH_EXEC.
* server/config.c: Update to remove OPT_INCNOEXEC from default
override_opts; no functional change.
* modules/filters/mod_include.c (includes_filter): Update to reflect
new options semantics - disable exec= support if the
OPT_INC_WITH_EXEC bit is not set.
Submitted by: Jonathan Peatfield <j.s.peatfield damtp.cam.ac.uk>,
jorton
Thanks to: Vincent Danon <vdanon redhat.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772997
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 8 May 2009 06:47:33 +0000 (06:47 +0000)]
Add . 'default' test first before searching paths, to determine if the
lua.h, liblua5.1, liblua-5.1 or liblua can be resolved. This avoids
adding strange paths on fedora/redhat, and choosing the wrong /lib[64]
flavor.
Also ensure -lm is always added to the actual linked libraries, avoiding
a LoadModule failure on fedora/redhat. Still should first try to search
for pkg-config lua settings, but note this would break fedora until that
build hackery is corrected, c.f. the bug
https://bugzilla.redhat.com/show_bug.cgi?id=499238
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772864
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 8 May 2009 05:46:28 +0000 (05:46 +0000)]
Here's the simpler solution to the two groups of mappers/ modules...
The mod_so and mod_watchdog are truly not mappers/ at all. Very open
to better names than modules/core/ but these are clearly API's which
are to be consumed by the httpd core, or generically, any module.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772848
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 7 May 2009 15:41:05 +0000 (15:41 +0000)]
Revert to preceding version.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772682
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Wed, 6 May 2009 18:16:22 +0000 (18:16 +0000)]
remove unused smutex structure element
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772387
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 6 May 2009 16:53:55 +0000 (16:53 +0000)]
Fix usage message on the Windows platform.
- do not include graceful commands and duplicate
start|restart|stop
- add ServerRoot to the parameters encapsulated by "-n"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772356
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 6 May 2009 14:32:46 +0000 (14:32 +0000)]
update comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772279
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 6 May 2009 13:39:31 +0000 (13:39 +0000)]
Move comment block closer to related function.
No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772249
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 6 May 2009 12:56:04 +0000 (12:56 +0000)]
simple formatting line-wrap/no functional changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772192
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 6 May 2009 12:54:17 +0000 (12:54 +0000)]
Use canonical testing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772190
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 6 May 2009 10:06:06 +0000 (10:06 +0000)]
* Fix syntax error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772126
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 5 May 2009 22:37:02 +0000 (22:37 +0000)]
Reorder so and watchdog to configure before cluster modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771998
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 5 May 2009 22:36:31 +0000 (22:36 +0000)]
Ensure all mpm's configure at config3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771997
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 5 May 2009 21:49:01 +0000 (21:49 +0000)]
fix docco
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771981
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 5 May 2009 19:29:04 +0000 (19:29 +0000)]
optimize.... rp! :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771976
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 5 May 2009 18:52:59 +0000 (18:52 +0000)]
comment change, no functional change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771966
13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Tue, 5 May 2009 17:15:48 +0000 (17:15 +0000)]
Change the order of mod_proxy and mod_proxy_balancer child_init().
Change the balancer workers area to the address of workers instead copying the workers.
Arrange lbmethod accordingly.
Move the creation of conf->forward worker to mod_proxy child_init().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771940
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 5 May 2009 16:55:56 +0000 (16:55 +0000)]
Explain empty code block (empty for now, that is) :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771925
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 5 May 2009 16:36:12 +0000 (16:36 +0000)]
xforms!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771911
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Tue, 5 May 2009 14:08:31 +0000 (14:08 +0000)]
Documentation update for mod_privileges changes in r771144/771145.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771733
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 5 May 2009 12:38:15 +0000 (12:38 +0000)]
Move to an enum, instead of bitmaps... no functional
change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771697
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 5 May 2009 07:43:14 +0000 (07:43 +0000)]
* Silence compiler warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771610
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 5 May 2009 06:47:21 +0000 (06:47 +0000)]
Complete the integration of mod_heartbeat, mod_heartmonitor and the
loadable mod_watchdog, started with 771581.
This clears my list of missing modules as of 6 weeks ago, might be
a few new still to clear up.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771589
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 5 May 2009 06:44:02 +0000 (06:44 +0000)]
As mentioned inline in comments, correctly handle more sophisticated
transformations which currently fail for balancer://foo targets, but
work just fine with other ProxyReverse targets.
The balancer comparison is a bit trickier. Given the context
BalancerMember balancer://alias http://example.com/foo
ProxyPassReverse /bash balancer://alias/bar
translate url http://example.com/foo/bar/that to /bash/that
E.g. there may be several different url-suffixes (1st order) of any
particular BalancerMember set e.g. /app1, /app1 and /appbeta while
there may be additional suffixes associated with the actual
ProxyPassReverse directive. Neither were properly reversed, now
both should be properly handled.
One *critical* assumption;
BalancerMember balancer://alias/foo http://example.com/bar
should be documented as a meaningless construct, since one cannot
have two members, balancer://alias/foo and balancer://alias/bar,
and the balancer member structures discard this path.
Note one more existing error case as an XXX comment due to invalid
uri comparisons.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771587
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 5 May 2009 06:39:03 +0000 (06:39 +0000)]
REVERT 771581 modules/proxy/ changes (miscommitted)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771583
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 5 May 2009 06:26:24 +0000 (06:26 +0000)]
complete r771579, refactoring mod_watchdog as loadable on win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771581
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 5 May 2009 06:23:29 +0000 (06:23 +0000)]
MPM's are now dynamically loadable; so must mod_watchdog be.
The only module with an excuse now is mod_so which implements
LoadModule itself.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771579
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 5 May 2009 04:58:44 +0000 (04:58 +0000)]
Add balancer module targets
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771564
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Tue, 5 May 2009 03:31:22 +0000 (03:31 +0000)]
add creation type parameter per r771286
remove lock/unlock structure elements per r771262
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771539
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Tue, 5 May 2009 03:30:00 +0000 (03:30 +0000)]
silence warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771537
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 4 May 2009 21:45:50 +0000 (21:45 +0000)]
* Remove unused locking functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771458
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 4 May 2009 21:37:09 +0000 (21:37 +0000)]
* Optimize access to server_rec.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771455
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 4 May 2009 18:35:40 +0000 (18:35 +0000)]
Simple style fix, this message still is nonsensical
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771390
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 4 May 2009 16:44:23 +0000 (16:44 +0000)]
One typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771355
13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Mon, 4 May 2009 12:22:36 +0000 (12:22 +0000)]
Add a parameter for slotmem_create for the persistancy of the slotmem area.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771286
13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Mon, 4 May 2009 11:58:50 +0000 (11:58 +0000)]
Fix shared memory permisson problems.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771278
13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Mon, 4 May 2009 10:20:42 +0000 (10:20 +0000)]
Remove ap_slotmem_lock / ap_slotmem_unlock from the slotmem API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771262
13f79535 -47bb-0310-9956-
ffa450edef68