]>
granicus.if.org Git - apache/log
Jim Jagielski [Wed, 19 Jan 2011 02:41:49 +0000 (02:41 +0000)]
Make the balancer shared memory slot more human readable. But we need
to make it a "safe" filename, so create 2 funcs which do that.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1060657 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 18 Jan 2011 22:52:02 +0000 (22:52 +0000)]
update transforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1060607 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 18 Jan 2011 22:50:44 +0000 (22:50 +0000)]
Briefly describe <If> sections and how they are merged.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1060606 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 18 Jan 2011 21:42:23 +0000 (21:42 +0000)]
Fix some warnings with Visual Studio reported by Gregg L. Smith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1060588 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 18 Jan 2011 14:52:31 +0000 (14:52 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1060402 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 18 Jan 2011 14:25:35 +0000 (14:25 +0000)]
Revert "Updates."
This reverts commit
c2edd395de0869c413cb4e2d7edea2c5717df5a0 .
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1060392 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 18 Jan 2011 09:58:26 +0000 (09:58 +0000)]
Initialize the core_dir_config->sec_files and ->sec_if only if needed.
This saves some memory and two apr_array_append()s per directory merge.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1060283 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 18 Jan 2011 09:12:00 +0000 (09:12 +0000)]
remove some redundant NULL assignments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1060255 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 18 Jan 2011 09:01:19 +0000 (09:01 +0000)]
Check for s->module_config before using it, as the faked server_rec from
mod_cgid does not have it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1060245 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 17 Jan 2011 22:16:51 +0000 (22:16 +0000)]
Align proxy_worker_shared in slotmem shm
using default APR alignment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1060112 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 17 Jan 2011 22:09:18 +0000 (22:09 +0000)]
mod_slotmem_shm is a predecessor of
mod_proxy_balancer, not mod_proxy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1060109 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 17 Jan 2011 22:03:45 +0000 (22:03 +0000)]
Increase memory alignment for slotmem data in
mod_slotmem_shm.
Consumers still need to choose the slot sizes
appropriate for consistent alignment.
mod_slotmem_shm only cares about the alignment
for the first slot.
We use the APR default alignment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1060108 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 17 Jan 2011 20:14:54 +0000 (20:14 +0000)]
Fix segfault for loglevel >= trace2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1060072 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 17 Jan 2011 13:27:03 +0000 (13:27 +0000)]
* modules/ssl/ssl_engine_config.c, modules/ssl/ssl_private.h: Add
config hooks for OCSP response time skew, maximum age, timeout.
* modules/ssl/ssl_engine_ocsp.c (verify_ocsp_status): Respect
config settings for above.
* docs/: Update accordingly.
Submitted by: Kaspar Brand <httpd-dev.2011 velox.ch>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059917 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 17 Jan 2011 13:14:21 +0000 (13:14 +0000)]
* modules/ssl/ssl_engine_io.c: Revamp output buffering: add a
"coalesce" filter which buffers the plaintext, and remove buffering
of the SSL records -- i.e. buffer before the SSL output filter,
rather than after it. This aims to reduce the network overhead
imposed by the output of many small brigades (such as produced by
chunked HTTP response), which can now be transformed into a few
large TLS records rather than many small ones.
(ssl_filter_ctx_t): Remove "nobuffer" field.
(bio_filter_out_ctx_t): Remove length, buffer, blen fields.
(bio_filter_out_pass): Split from bio_filter_out_flush.
(bio_filter_out_write): Remove handling of buffer.
(bio_filter_out_ctrl): Adjust to reflect lack of buffer.
(ssl_io_filter_coalesce): Add new filter...
(ssl_io_filter_init): ...add it to the filter chain...
(ssl_io_filter_register): ...and register it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059910 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 17 Jan 2011 11:02:38 +0000 (11:02 +0000)]
Merge the <If> sections in a separate step ap_if_walk, after ap_location_walk.
This makes <If> apply to all requests, not only to file base requests and
it allows to use <If> inside <Directory>, <Location>, and <Files> sections.
The merging of <If> sections always happens after the merging of <Location>
sections, even if the <If> section is embedded inside a <Directory> or
<Files> section.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059867 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 17 Jan 2011 10:45:54 +0000 (10:45 +0000)]
Add server directory to INCLUDES.
util_expr needs its header files and without
explicitely adding the directory out of tree
builds fail.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059858 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 17 Jan 2011 10:44:33 +0000 (10:44 +0000)]
Change file touching order for util_expr to be in
sync with Makefile dependency.
The existing order lead to regeneration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059857 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sun, 16 Jan 2011 19:39:33 +0000 (19:39 +0000)]
Added mod_reflector to Win32 build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059644 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 16 Jan 2011 16:46:40 +0000 (16:46 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059612 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 16 Jan 2011 15:38:58 +0000 (15:38 +0000)]
REbuild transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059586 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 16 Jan 2011 15:33:12 +0000 (15:33 +0000)]
Specify the default settings, as requested in tid50417
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059584 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 16 Jan 2011 15:28:49 +0000 (15:28 +0000)]
Rephrase comment about default ordering to clarify interaction between
default ordering and client preferences. tid50417
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059582 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 16 Jan 2011 14:16:35 +0000 (14:16 +0000)]
Rebuild transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059567 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 16 Jan 2011 14:14:40 +0000 (14:14 +0000)]
Rebuild transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059565 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 16 Jan 2011 14:08:01 +0000 (14:08 +0000)]
Provide the IndexIgnore example that's in the httpd-autoindex config
file in extras.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059562 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 16 Jan 2011 14:02:28 +0000 (14:02 +0000)]
Additional note about BLANKICON, as per tid50417
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059561 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 16 Jan 2011 13:52:19 +0000 (13:52 +0000)]
As per tid50417, clarify that the icon URL can in fact be a
fully-qualified remote URL.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059559 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 16 Jan 2011 04:22:25 +0000 (04:22 +0000)]
config: report error and exit cleanly if getaddrinfo fails at startup
PR: 50592
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059472 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Sat, 15 Jan 2011 15:21:54 +0000 (15:21 +0000)]
* .gdbinit: Add dump_request_tree macro.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059357 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Sat, 15 Jan 2011 15:20:50 +0000 (15:20 +0000)]
* docs/manual/mod/mod_rewrite.xml: Fix docs to match code; only
"discardpath" is accepted, not "discardpathinfo".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059356 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Sat, 15 Jan 2011 15:17:13 +0000 (15:17 +0000)]
* modules/cache/mod_socache_shmcb.c: Comment tweak.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059354 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 15 Jan 2011 01:35:39 +0000 (01:35 +0000)]
Added NetWare makefiles for slotmem modules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059221 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 15 Jan 2011 00:35:00 +0000 (00:35 +0000)]
Removed useless echo line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059218 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 14 Jan 2011 21:22:07 +0000 (21:22 +0000)]
Typo. Remove item that is done. Add new item. It never ends.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059176 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 14 Jan 2011 21:18:27 +0000 (21:18 +0000)]
Rebuild HTML.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059175 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 14 Jan 2011 21:18:20 +0000 (21:18 +0000)]
XML error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059174 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 14 Jan 2011 21:15:44 +0000 (21:15 +0000)]
Remove unnecessary <pre> tags in <example> blocks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059171 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 14 Jan 2011 21:13:24 +0000 (21:13 +0000)]
Remove unncessary <pre> tags inside <example> blocks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059169 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 14 Jan 2011 21:08:31 +0000 (21:08 +0000)]
Remove unnecessary <pre> tags from <example> blocks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059167 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 14 Jan 2011 21:04:03 +0000 (21:04 +0000)]
Rebuild HTML
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059166 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 14 Jan 2011 21:02:54 +0000 (21:02 +0000)]
Remove unnecessary use of <pre> in <example> blocks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059165 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 14 Jan 2011 20:57:26 +0000 (20:57 +0000)]
Rebuild HTML
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059164 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 14 Jan 2011 20:56:32 +0000 (20:56 +0000)]
Adds the second virtual host to the example, so that we don't end up
having to re-explain that part every time on IRC.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059163 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 14 Jan 2011 16:27:15 +0000 (16:27 +0000)]
Rebuild transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059059 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 14 Jan 2011 16:21:09 +0000 (16:21 +0000)]
Provides an example of using expr in a RewriteCond for a commonly-requested recipe.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059058 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 14 Jan 2011 16:09:18 +0000 (16:09 +0000)]
Remove NameVirtualHost, as it causes a startup warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059054 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 14 Jan 2011 15:14:16 +0000 (15:14 +0000)]
* We can only get there if the line is too long and in this case
we should return the partial line as defined in util_filter.h.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059037 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 14 Jan 2011 14:32:43 +0000 (14:32 +0000)]
minor note... bunch of old, old stuff lives here
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1059018 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 14 Jan 2011 13:11:14 +0000 (13:11 +0000)]
Oops... I didn't see the test framework error here, but rpluem
did. Thx!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058998 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jan 2011 23:25:48 +0000 (23:25 +0000)]
Display number of members possible per balancer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058795 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jan 2011 16:59:44 +0000 (16:59 +0000)]
It's a change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058660 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 13 Jan 2011 16:13:33 +0000 (16:13 +0000)]
Rebuild transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058645 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 13 Jan 2011 16:12:32 +0000 (16:12 +0000)]
Remove unnecessary <pre> formatting inside <example>s
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058643 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 13 Jan 2011 16:10:29 +0000 (16:10 +0000)]
Remove unnecessary <pre> in <example> blocks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058639 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jan 2011 16:05:28 +0000 (16:05 +0000)]
Update docco xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058636 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jan 2011 15:59:25 +0000 (15:59 +0000)]
And check the nonce, taking care to ensure that the
form actually specified a balancer.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058630 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jan 2011 15:59:22 +0000 (15:59 +0000)]
Move nonce to balancer struct and add logic for nonce and growth.
Adjust mmn and update doccos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058629 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jan 2011 15:59:16 +0000 (15:59 +0000)]
Just a note regarding these bitfields
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058628 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jan 2011 15:59:13 +0000 (15:59 +0000)]
Set some defaults... do it here @ worker creation, not initialization
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058627 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jan 2011 15:59:10 +0000 (15:59 +0000)]
whitespace
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058626 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jan 2011 15:59:05 +0000 (15:59 +0000)]
Builds and passes tests as prefork... good save state
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058625 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jan 2011 15:59:02 +0000 (15:59 +0000)]
Adjust for conf->workers being *proxy_worker and balancer->workers being **proxy_worker
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058624 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jan 2011 15:58:57 +0000 (15:58 +0000)]
More movement to shared stuff...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058623 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jan 2011 15:58:50 +0000 (15:58 +0000)]
OK... a good commit point (we don't quite compile yet though...)
Pull out the worker scoreboard cruft and start moving most
worker stuff to shm. Use slotmem for workers and provide
space for growth.
Redo logic:
ap_proxy_define_*
ap_proxy_create_*
ap_proxy_initialize_*
Right now just for workers, but lay framework for balancers
as well. The idea is to break out the functional parts
to make it easy for dynamics. Defining is simply describing
the worker, and tucking that info away. When we create, we
go ahead and create the shared memory, etc... Initialize
is simply to allow child process to access the shm...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058622 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jan 2011 15:58:45 +0000 (15:58 +0000)]
Use branch now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058621 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 13 Jan 2011 15:43:33 +0000 (15:43 +0000)]
No, he's not in fact working on that.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058615 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 13 Jan 2011 14:48:21 +0000 (14:48 +0000)]
Rebuild transformations and translations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058589 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 13 Jan 2011 14:47:22 +0000 (14:47 +0000)]
Tweaks to the language to make it sound less like this is a nifty new
feature. Grammatical changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058587 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 13 Jan 2011 14:43:51 +0000 (14:43 +0000)]
Updates to reflect current status of project.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058585 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 12 Jan 2011 15:33:04 +0000 (15:33 +0000)]
generated file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058193 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 12 Jan 2011 15:32:41 +0000 (15:32 +0000)]
ttl: note that connections are closed at some unspecified point
after reaching this limit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058192 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 12 Jan 2011 13:32:53 +0000 (13:32 +0000)]
* Fix comment typo as noticed by jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1058133 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 11 Jan 2011 23:10:06 +0000 (23:10 +0000)]
Save a useless check:
ap_get_request_note() cannot fail unless there is a bug somewhere and if
prep_walk_cache() returned NULL, we would just segfault later on.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057920 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 11 Jan 2011 21:38:42 +0000 (21:38 +0000)]
mention when APLOG_USE_MODULE() and AP_DECLARE_MODULE() were added
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057883 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 11 Jan 2011 21:13:20 +0000 (21:13 +0000)]
Use -Wdeclaration-after-statement in maintainer mode if we use a recent
enough gcc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057868 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Jan 2011 17:30:59 +0000 (17:30 +0000)]
revert...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057748 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Tue, 11 Jan 2011 14:30:28 +0000 (14:30 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057660 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Tue, 11 Jan 2011 14:24:55 +0000 (14:24 +0000)]
XML validation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057657 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 11 Jan 2011 14:24:01 +0000 (14:24 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057656 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 11 Jan 2011 13:53:18 +0000 (13:53 +0000)]
avoid hostname in example multi-daemon Listen stmt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057632 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 11 Jan 2011 13:50:11 +0000 (13:50 +0000)]
typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057630 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 10 Jan 2011 21:21:45 +0000 (21:21 +0000)]
comment on where multiple headers with same name get merged
(some strict Cookie parsers can't handle what happens later,
but that is not our fault)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057372 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 10 Jan 2011 19:34:37 +0000 (19:34 +0000)]
clarify that the displayed IP address may not be the public address,
as suggested by wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057329 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 10 Jan 2011 19:14:03 +0000 (19:14 +0000)]
Rebuild HTML transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057321 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 9 Jan 2011 23:07:52 +0000 (23:07 +0000)]
Display the local IP address in server-status. This can be useful for HTTPDs
behind load balancers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057050 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 9 Jan 2011 23:04:56 +0000 (23:04 +0000)]
warn about FAQ of trying to decrease thread stack size with ThreadStackSize
on Linux.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057049 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 9 Jan 2011 23:00:33 +0000 (23:00 +0000)]
mod_status: Don't show slots which are disabled by MaxClients as open.
PR: 47022
Submitted by: Jordi Prats <jordi prats gmail com>, Stefan Fritsch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057048 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 9 Jan 2011 22:47:33 +0000 (22:47 +0000)]
Fix ap_mpm_query results:
AP_MPMQ_MAX_THREADS: Single threaded means one thread per child, not zero
AP_MPMQ_MAX_DAEMONS: Max # daemons by config is determined by MaxClients, not
ServerLimit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1057045 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 8 Jan 2011 14:37:09 +0000 (14:37 +0000)]
Don't log AuthMerging XXX as <RequireXXX>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1056717 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 8 Jan 2011 14:29:12 +0000 (14:29 +0000)]
Fix a bug in authz logic merging which caused
section->op == AUTHZ_LOGIC_AND
auth_result == AUTHZ_DENIED_NO_USER
child_result == AUTHZ_GRANTED
to return AUTHZ_GRANTED instead of AUTHZ_DENIED_NO_USER.
While there, refactor the if blocks to make them a bit more readable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1056713 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 8 Jan 2011 11:51:00 +0000 (11:51 +0000)]
Add rpluem's suggested warning against of loss of logging data on a crash.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1056693 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 7 Jan 2011 18:37:25 +0000 (18:37 +0000)]
It's been 8 years, I think this directive can be considered not-experimental.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1056448 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 7 Jan 2011 14:17:54 +0000 (14:17 +0000)]
whitespace
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1056331 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 7 Jan 2011 14:17:50 +0000 (14:17 +0000)]
Use consistant naming and be sure to pad
all shm size slots, due to char* and void*
adjustments...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1056330 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 7 Jan 2011 12:07:40 +0000 (12:07 +0000)]
Rebuild Covener's changes from jan 5
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1056280 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 7 Jan 2011 12:04:37 +0000 (12:04 +0000)]
Rebuild transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1056279 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 7 Jan 2011 12:01:07 +0000 (12:01 +0000)]
Mention third-party distributions, and provide a link to the wiki page
listing common layouts of these 3p distros.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1056278 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 6 Jan 2011 07:24:22 +0000 (07:24 +0000)]
* Be ANSI C compatible
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1055771 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 6 Jan 2011 02:12:01 +0000 (02:12 +0000)]
clarify RewriteBase as action for closed PR50546
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1055710 13f79535 -47bb-0310-9956-
ffa450edef68