granicus.if.org Git - apache/log

]> granicus.if.org Git - apache/log

projects / apache / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Jim Jagielski [Tue, 8 Feb 2011 21:08:10 +0000 (21:08 +0000)]

Remove the thread mutex from the worker... it really should be
in the balancer. Thus we have global and thread for the balancer.
Use global when updating the full, shm list of workers; use
thread when being local.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068581 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Tue, 8 Feb 2011 13:59:36 +0000 (13:59 +0000)]

Expose this as part of the API. That way, other code/modules
which want to overload mod_proxy's trans phase can use it to
handle ProxyPass as well, without requiring monkeying
with conf->aliases...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068400 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Joe Orton [Tue, 8 Feb 2011 13:47:23 +0000 (13:47 +0000)]

* server/mpm/prefork/prefork.c (stop_listening, sig_term, restart):
Update mpm_state in the signal handlers such that it is correct in
children during a graceful stop/restart too.

PR: 41743
Submitted by: Andrew Punch <andrew.punch 247realmedia.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068389 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rich Bowen [Tue, 8 Feb 2011 11:15:42 +0000 (11:15 +0000)]

Rebuild transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068331 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rich Bowen [Tue, 8 Feb 2011 11:14:09 +0000 (11:14 +0000)]

Custom, not Customer, error docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068329 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 7 Feb 2011 19:32:31 +0000 (19:32 +0000)]

Only persist if we want it to

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068072 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 7 Feb 2011 19:25:14 +0000 (19:25 +0000)]

OK, use faster, shared version... makes sense to persist this
info since it is aligned with the actual data itself.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068066 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 7 Feb 2011 17:15:04 +0000 (17:15 +0000)]

Keep track of how many workers we've used so far... no need
to provide field to add another if no slots exist.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068020 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 7 Feb 2011 17:15:02 +0000 (17:15 +0000)]

Save this for later to be done... recall that .free needs to
exist in shm...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068019 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 7 Feb 2011 17:14:59 +0000 (17:14 +0000)]

Slotmem now provides for the number of "free" slots
available.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068018 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 7 Feb 2011 15:25:09 +0000 (15:25 +0000)]

Mutex around adding a new worker...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067965 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Sat, 5 Feb 2011 21:09:12 +0000 (21:09 +0000)]

test_char.h is a dependency, not a source. This seems to fix the occasional
"No rule to make target `server/test_char.h'" errors when doing a parallel
build.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067525 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Sat, 5 Feb 2011 19:02:33 +0000 (19:02 +0000)]

revert r1066944, r1067177 for now

breaks MacOS X and wherever this code will go, server/main.c does not seem to be the right place.
See
http://mail-archives.apache.org/mod_mbox/httpd-dev/201102.mbox/%3C01930193-8A3B-4635-9EB0-5EE31349E49C@jaguNET.com%3E

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067483 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Sat, 5 Feb 2011 16:58:56 +0000 (16:58 +0000)]

Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067467 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Fri, 4 Feb 2011 20:34:47 +0000 (20:34 +0000)]

Lock around the time when we're mucking w/ balancers...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067276 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Fri, 4 Feb 2011 20:01:04 +0000 (20:01 +0000)]

Here we go... we can now, via balancer-manager, add new
workers to existing balancers. Still work to be done,
like error checking that we aren't trying to add more
than we can (right now, it fails, but it would be nice
to handle it nicer), disabling and *deleting* workers
we don't want anymore, the actual drain method, etc...
but this is some major goodness.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067269 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Fri, 4 Feb 2011 16:11:15 +0000 (16:11 +0000)]

might as well allow for the sticky session to be adjusted as well...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067206 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Fri, 4 Feb 2011 16:11:12 +0000 (16:11 +0000)]

Oops.... we need to adjust sticky, which is an array now

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067205 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

André Malo [Fri, 4 Feb 2011 15:11:14 +0000 (15:11 +0000)]

update convmap

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067189 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Fri, 4 Feb 2011 13:50:39 +0000 (13:50 +0000)]

And yet more balancer params that can be changed at runtime via
the b-m application...

next up, of course, is adding new workers ;)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067178 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Fri, 4 Feb 2011 13:24:39 +0000 (13:24 +0000)]

Until this is fixed to link in lresolv, exclude.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067177 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Thu, 3 Feb 2011 20:20:02 +0000 (20:20 +0000)]

Reload resolv.conf on graceful restarts

PR: 50619
Submitted by: Matt Miller <m miller f5 com>, Stefan Fritsch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066944 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Thu, 3 Feb 2011 17:02:38 +0000 (17:02 +0000)]

Optimize memory access pattern of ap_merge_per_dir_configs()

According to Linux perf, this is twice as fast as the old loop.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066869 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Thu, 3 Feb 2011 16:51:28 +0000 (16:51 +0000)]

Raise DYNAMIC_MODULE_LIMIT to 256

discussed at
http://mail-archives.apache.org/mod_mbox/httpd-dev/201006.mbox/%3C4C268563.30006@rowe-clan.net%3E

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066864 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 2 Feb 2011 21:25:34 +0000 (21:25 +0000)]

No need to pollute the whole namespace...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066631 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Igor Galić [Wed, 2 Feb 2011 21:23:41 +0000 (21:23 +0000)]

Status update

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066630 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 2 Feb 2011 20:17:22 +0000 (20:17 +0000)]

Optimize... create a struct to hold the worker status info
(need to align w/ set_params later on) and note when we
update timestamps

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066607 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Igor Galić [Wed, 2 Feb 2011 14:43:23 +0000 (14:43 +0000)]

update transformations

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066484 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 2 Feb 2011 14:39:48 +0000 (14:39 +0000)]

Instead of just enabling/disabling, we can now adjust
more useful worker status bits, such as whether hot stby, etc...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066482 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Nick Kew [Wed, 2 Feb 2011 12:07:58 +0000 (12:07 +0000)]

DrBacchus sez fix-a-docs-bug
PR 50396
Pedantry over description of qs-values.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066440 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Nick Kew [Wed, 2 Feb 2011 11:55:47 +0000 (11:55 +0000)]

DrBacchus says Fix-a-docs-bug
PR 50396
Historical reasons for using IP-based virtualhosting no longer deserve
to be featured in our docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066434 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Igor Galić [Wed, 2 Feb 2011 10:50:07 +0000 (10:50 +0000)]

tid 50632, specifying the default of proxy-interim-response

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066408 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Tue, 1 Feb 2011 19:07:02 +0000 (19:07 +0000)]

Again, abstract out the worker status magic to it's handled
by funcs...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066138 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Tue, 1 Feb 2011 18:14:37 +0000 (18:14 +0000)]

bitfields should be unsigned

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066112 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Tue, 1 Feb 2011 18:13:15 +0000 (18:13 +0000)]

Move the setting of flags into a func... that way there is
one place to maintain as the number of flags grow...

Since we are using just the bits, make unsigned.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066110 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Tue, 1 Feb 2011 16:00:01 +0000 (16:00 +0000)]

We can now change lbmethod at runtime.

Provide a stub for other balancer-related params to
be adjusted as well, like timeout, sticky, etc...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066076 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Vincent Deffontaines [Mon, 31 Jan 2011 20:47:02 +0000 (20:47 +0000)]

Forgot to encode accents in r1065768

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1065770 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Vincent Deffontaines [Mon, 31 Jan 2011 20:45:49 +0000 (20:45 +0000)]

Adding a french translation for expr.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1065768 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Vincent Deffontaines [Mon, 31 Jan 2011 20:39:33 +0000 (20:39 +0000)]

Adding a link to the wikipedia page describing BNF.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1065758 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 31 Jan 2011 20:29:03 +0000 (20:29 +0000)]

A new mode that is maintainer + O0 (for better gdb)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1065751 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 31 Jan 2011 20:29:01 +0000 (20:29 +0000)]

Move the lbmethod to also allow it to be adjusted runtime

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1065750 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 31 Jan 2011 20:28:57 +0000 (20:28 +0000)]

tuck away code that lets us ensure that the id is always
"unique"

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1065749 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 31 Jan 2011 20:28:52 +0000 (20:28 +0000)]

Move some "nice to be able to change" balancer stuff to shm

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1065748 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Vincent Deffontaines [Mon, 31 Jan 2011 20:15:30 +0000 (20:15 +0000)]

Setting missing LastChangedRevision to the latest "svn blame" revision I found.
However the present [post] commit should override it...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1065742 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Sat, 29 Jan 2011 14:39:45 +0000 (14:39 +0000)]

Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1065023 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Thu, 27 Jan 2011 19:34:38 +0000 (19:34 +0000)]

Revert an old (~10yr) change to the fd Q; move back to
FIFO rather than LIFO, for more consistent performance
so that older requests don't suffer

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1064269 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Guenter Knauf [Wed, 26 Jan 2011 22:31:14 +0000 (22:31 +0000)]

Added mod_slotmem*.dsp files forgotten with commit r1063507.

Submitted by Gregg L. Smith - gregg AT apachehaus.com.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1063902 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Wed, 26 Jan 2011 03:21:58 +0000 (03:21 +0000)]

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1063589 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Wed, 26 Jan 2011 03:20:24 +0000 (03:20 +0000)]

the comparison string has been decoded for rewriterule comparison. PR50653

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1063587 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Wed, 26 Jan 2011 03:12:56 +0000 (03:12 +0000)]

point to where SERVER_NAME and SERVER_PORT get their
values. PR50655

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1063585 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Guenter Knauf [Tue, 25 Jan 2011 23:05:46 +0000 (23:05 +0000)]

Added slotmem* modules to Win32 build.

Submitted by Gregg L. Smith - gregg AT apachehaus.com.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1063507 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Tue, 25 Jan 2011 19:37:47 +0000 (19:37 +0000)]

Make worker the default MPM for 2.3/2.4

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1063419 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Tue, 25 Jan 2011 19:29:52 +0000 (19:29 +0000)]

Update with latest info

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1063414 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Mon, 24 Jan 2011 22:12:24 +0000 (22:12 +0000)]

break some very long lines, no code change

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1063016 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Mon, 24 Jan 2011 21:52:16 +0000 (21:52 +0000)]

update transforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1063003 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Mon, 24 Jan 2011 21:42:46 +0000 (21:42 +0000)]

fix typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1062995 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Mon, 24 Jan 2011 21:41:36 +0000 (21:41 +0000)]

mod_session_crypto is not supported by a released APR. Mark as experimental

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1062993 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Mon, 24 Jan 2011 21:38:25 +0000 (21:38 +0000)]

adjust spelling
mark mod_dialup as experimental

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1062991 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Mon, 24 Jan 2011 21:30:03 +0000 (21:30 +0000)]

Mark some modules/directives non-experimental:
- BufferedLogs and mod_substitute have been around a long time
- mod_reqtimeout has stabilized as well

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1062989 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Sun, 23 Jan 2011 15:14:31 +0000 (15:14 +0000)]

Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1062450 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rich Bowen [Fri, 21 Jan 2011 18:20:51 +0000 (18:20 +0000)]

Rebuilding various recent changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061947 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Fri, 21 Jan 2011 16:27:41 +0000 (16:27 +0000)]

Mkae gcc no longer silent when doing arith on void*...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061883 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Fri, 21 Jan 2011 16:13:21 +0000 (16:13 +0000)]

arith on void* is not good

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061874 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Fri, 21 Jan 2011 12:51:57 +0000 (12:51 +0000)]

Ignore leading dots when looking for mime extensions
PR 50434

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061791 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Fri, 21 Jan 2011 11:32:13 +0000 (11:32 +0000)]

Add more documentations for Define'd variables

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061758 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Fri, 21 Jan 2011 09:03:52 +0000 (09:03 +0000)]

Make ap_pstr2_alnum accept const char dest

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061695 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Fri, 21 Jan 2011 08:01:09 +0000 (08:01 +0000)]

* Only unset if we have a table. This can happen if undefine occurs before define.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061669 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Thu, 20 Jan 2011 19:17:38 +0000 (19:17 +0000)]

Update docs for changed Define syntax

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061468 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Thu, 20 Jan 2011 19:12:32 +0000 (19:12 +0000)]

Add support to set variables with the 'Define' directive. Change
ap_resolve_env() to look for variables defined in this way. This allows to use
the variables in the config using the ${VAR} syntax known from envvar
interpolation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061465 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Thu, 20 Jan 2011 18:37:47 +0000 (18:37 +0000)]

Move ap_resolve_env to core.c, in preparation for adding mod_define-like
variable support.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061444 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Igor Galić [Thu, 20 Jan 2011 18:02:36 +0000 (18:02 +0000)]

Rebuild transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061428 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Igor Galić [Thu, 20 Jan 2011 17:57:53 +0000 (17:57 +0000)]

Weeding out some old references. Replacing w3.org/cgi with link to CGI RFC.
Replacing hoohoo.ncsa.uiuc.edu with links to CGI RFC. This fixes PR#50622

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061423 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Fritsch [Wed, 19 Jan 2011 21:23:34 +0000 (21:23 +0000)]

Fix compile error

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1060996 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Vincent Deffontaines [Wed, 19 Jan 2011 14:40:44 +0000 (14:40 +0000)]

Propagating r1060795 to the compiled doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1060827 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 19 Jan 2011 13:08:08 +0000 (13:08 +0000)]

Make it clear that '_' is a possible char and accepted

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1060802 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Igor Galić [Wed, 19 Jan 2011 12:48:17 +0000 (12:48 +0000)]

Add a patch from Vincent Deffontaines to make the adding of X-forwarded-*
headers configurable: ProxyAddHeaders, defaulting to 'On'.
http://www.mail-archive.com/dev@httpd.apache.org/msg49971.html

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1060795 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Unnamed repository; edit this file 'description' to name the repository.