]> granicus.if.org Git - apache/log
apache
13 years agofix some logging calls to include the server_rec
Jeff Trawick [Sat, 26 Feb 2011 15:32:01 +0000 (15:32 +0000)]
fix some logging calls to include the server_rec
(and even the conn_rec in a couple of places)

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

13 years agoAxed C++ comments and tabs.
Guenter Knauf [Sat, 26 Feb 2011 09:34:47 +0000 (09:34 +0000)]
Axed C++ comments and tabs.

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

13 years ago'votes'
Philip M. Gollucci [Sat, 26 Feb 2011 02:14:15 +0000 (02:14 +0000)]
'votes'

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

13 years agofix function name in log text
Jeff Trawick [Fri, 25 Feb 2011 18:25:57 +0000 (18:25 +0000)]
fix function name in log text

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

13 years agoWe are going for beta
Jim Jagielski [Fri, 25 Feb 2011 14:13:07 +0000 (14:13 +0000)]
We are going for beta

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

13 years agoDocument mod_proxy work... userland changes
Jim Jagielski [Wed, 23 Feb 2011 13:41:38 +0000 (13:41 +0000)]
Document mod_proxy work... userland changes

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

13 years agoprotect one-off boundary
Jim Jagielski [Wed, 23 Feb 2011 13:03:58 +0000 (13:03 +0000)]
protect one-off boundary

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

13 years agocaptures of THE_REQUEST are still escaped however the browser sent the request,
Eric Covener [Wed, 23 Feb 2011 04:26:06 +0000 (04:26 +0000)]
captures of THE_REQUEST are still escaped however the browser sent the request,
ulike most REQUEST_* variables.  PR#50758

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

13 years agoupdate xforms
Stefan Fritsch [Tue, 22 Feb 2011 23:20:23 +0000 (23:20 +0000)]
update xforms

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

13 years agoAdd some links and bits to the ap_expr docs
Stefan Fritsch [Tue, 22 Feb 2011 23:17:50 +0000 (23:17 +0000)]
Add some links and bits to the ap_expr docs

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

13 years agoBe at least somewhat more RESTful... Use POST for changing stuff.
Jim Jagielski [Tue, 22 Feb 2011 21:43:44 +0000 (21:43 +0000)]
Be at least somewhat more RESTful... Use POST for changing stuff.

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

13 years agoUpdates
Lucien Gentis [Sun, 20 Feb 2011 12:21:54 +0000 (12:21 +0000)]
Updates

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

13 years agoActually check for APU_HAVE_CRYPTO at configure time. This fixes a compile
Stefan Fritsch [Fri, 18 Feb 2011 21:27:12 +0000 (21:27 +0000)]
Actually check for APU_HAVE_CRYPTO at configure time.  This fixes a compile
error with apr 2 if crypto is disabled.

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

13 years agoExpose "new" ap_parse_form_data() function instead of requiring
Jim Jagielski [Fri, 18 Feb 2011 18:40:31 +0000 (18:40 +0000)]
Expose "new" ap_parse_form_data() function instead of requiring
mod_request for any module that may want to parse form data...

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

13 years agoNo longer depend on how fork() works when laying out segments...
Jim Jagielski [Fri, 18 Feb 2011 18:40:25 +0000 (18:40 +0000)]
No longer depend on how fork() works when laying out segments...
function pointers in shm are... nasty ;)

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

13 years agospelling fix
Jeff Trawick [Thu, 17 Feb 2011 21:19:16 +0000 (21:19 +0000)]
spelling fix

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

13 years agoFix link errors for crypt() with --no-add-needed/--no-copy-dt-needed-entries,
Stefan Fritsch [Wed, 16 Feb 2011 22:38:52 +0000 (22:38 +0000)]
Fix link errors for crypt() with --no-add-needed/--no-copy-dt-needed-entries,
which is the default for the gold linker.

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

13 years agoRebuild transformations.
Rich Bowen [Wed, 16 Feb 2011 12:25:03 +0000 (12:25 +0000)]
Rebuild transformations.

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

13 years agoI think I got the last of the "Allow from" and "Deny from" syntax, and
Rich Bowen [Wed, 16 Feb 2011 12:20:51 +0000 (12:20 +0000)]
I think I got the last of the "Allow from" and "Deny from" syntax, and
replaced it with the new access control syntax.

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

13 years agoRemoves more instances of 'allow from' and 'deny from' syntax. I think
Rich Bowen [Wed, 16 Feb 2011 12:19:59 +0000 (12:19 +0000)]
Removes more instances of 'allow from' and 'deny from' syntax. I think
that's the last of them.

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

13 years agoRemoves another instance of the "Allow from all" syntax.
Rich Bowen [Wed, 16 Feb 2011 12:11:41 +0000 (12:11 +0000)]
Removes another instance of the "Allow from all" syntax.

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

13 years agoap_main_state and ap_run_mode should be marked "extern"
Jeff Trawick [Wed, 16 Feb 2011 12:11:28 +0000 (12:11 +0000)]
ap_main_state and ap_run_mode should be marked "extern"

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

13 years agoWhitespace and small phrasing changes.
Rich Bowen [Wed, 16 Feb 2011 12:06:43 +0000 (12:06 +0000)]
Whitespace and small phrasing changes.

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

13 years agoNote of a good place to get content for overhauling the SSL howto
Rich Bowen [Tue, 15 Feb 2011 16:13:20 +0000 (16:13 +0000)]
Note of a good place to get content for overhauling the SSL howto
document.

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

13 years agoI don't think we want to encourage people to use _default_. It's
Rich Bowen [Tue, 15 Feb 2011 14:26:18 +0000 (14:26 +0000)]
I don't think we want to encourage people to use _default_. It's
confusing, and hardly ever the right solution.

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

13 years agoRebuild transformations.
Rich Bowen [Tue, 15 Feb 2011 14:25:03 +0000 (14:25 +0000)]
Rebuild transformations.

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

13 years agoPeople come to the SSL docs primarily for advice on getting SSL working.
Rich Bowen [Tue, 15 Feb 2011 14:23:40 +0000 (14:23 +0000)]
People come to the SSL docs primarily for advice on getting SSL working.
Arrange the TOC accordingly, and remove condescending introductory quote
and meaningless paragraph.

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

13 years agoNote to self: Look through the docs for examples using Order, Deny,
Rich Bowen [Tue, 15 Feb 2011 14:08:36 +0000 (14:08 +0000)]
Note to self: Look through the docs for examples using Order, Deny,
Allow, and convert them to the new Require syntax.

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

13 years agoRebuild quickreference file with typo fix.
Rich Bowen [Tue, 15 Feb 2011 14:05:27 +0000 (14:05 +0000)]
Rebuild quickreference file with typo fix.

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

13 years agoFix XML error. Rebuild access howto.
Rich Bowen [Tue, 15 Feb 2011 14:05:08 +0000 (14:05 +0000)]
Fix XML error. Rebuild access howto.

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

13 years agoTypo correction as per tid50766
Rich Bowen [Tue, 15 Feb 2011 14:01:09 +0000 (14:01 +0000)]
Typo correction as per tid50766

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

13 years agoRemove another mention of allow, deny, and order, and add a warning
Rich Bowen [Tue, 15 Feb 2011 13:55:18 +0000 (13:55 +0000)]
Remove another mention of allow, deny, and order, and add a warning
about their use.

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

13 years agoMore transformation rebuilding.
Rich Bowen [Tue, 15 Feb 2011 13:44:53 +0000 (13:44 +0000)]
More transformation rebuilding.

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

13 years agoCapitalization consistent with the rest of this page.
Rich Bowen [Tue, 15 Feb 2011 13:43:47 +0000 (13:43 +0000)]
Capitalization consistent with the rest of this page.

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

13 years agoRebuild html transformations.
Rich Bowen [Tue, 15 Feb 2011 13:43:24 +0000 (13:43 +0000)]
Rebuild html transformations.

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

13 years agoLinks to access control howto.
Rich Bowen [Tue, 15 Feb 2011 13:42:08 +0000 (13:42 +0000)]
Links to access control howto.

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

13 years agoExpand the name of the "Binding" document, which seems frequently
Rich Bowen [Tue, 15 Feb 2011 13:39:40 +0000 (13:39 +0000)]
Expand the name of the "Binding" document, which seems frequently
misunderstood or overlooked.

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

13 years agoRebuild html
Rich Bowen [Tue, 15 Feb 2011 13:34:49 +0000 (13:34 +0000)]
Rebuild html

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

13 years agoLink to expr.html for more details on expression syntax.
Rich Bowen [Tue, 15 Feb 2011 13:33:24 +0000 (13:33 +0000)]
Link to expr.html for more details on expression syntax.

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

13 years agoSmall improvements in phrasing of the access control doc.
Rich Bowen [Tue, 15 Feb 2011 13:15:42 +0000 (13:15 +0000)]
Small improvements in phrasing of the access control doc.

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

13 years agoRebulds transformation, adding simplified chinese translation documents.
Rich Bowen [Tue, 15 Feb 2011 12:52:47 +0000 (12:52 +0000)]
Rebulds transformation, adding simplified chinese translation documents.

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

13 years agoAdds simplified Chinese translation to httpd trunk docs. Via
Rich Bowen [Tue, 15 Feb 2011 12:46:52 +0000 (12:46 +0000)]
Adds simplified Chinese translation to httpd trunk docs. Via
dongsheng@apache.org (see tid 50767)

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

13 years agoRebuild documents from xml, including new access control howto.
Rich Bowen [Tue, 15 Feb 2011 12:15:49 +0000 (12:15 +0000)]
Rebuild documents from xml, including new access control howto.

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

13 years agoUpdates the access control howto for trunk. Could use a lot more
Rich Bowen [Tue, 15 Feb 2011 12:13:54 +0000 (12:13 +0000)]
Updates the access control howto for trunk. Could use a lot more
examples. The expression doc could use examples, too.

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

13 years agoCopies the access control howto from the 2.2 docs. However, it's going
Rich Bowen [Tue, 15 Feb 2011 11:54:27 +0000 (11:54 +0000)]
Copies the access control howto from the 2.2 docs. However, it's going
to need some work to be appropriate for trunk.

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

13 years agoThis document exists in the 2.2 docs, but not here. Not sure why. Need
Rich Bowen [Tue, 15 Feb 2011 11:27:12 +0000 (11:27 +0000)]
This document exists in the 2.2 docs, but not here. Not sure why. Need
to investigate.

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

13 years agoDon't skip the first character, as it may be a quote, which is handled
Graham Leggett [Mon, 14 Feb 2011 23:54:14 +0000 (23:54 +0000)]
Don't skip the first character, as it may be a quote, which is handled
by the walk below.

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

13 years agotypo in format string for 1070660
Eric Covener [Mon, 14 Feb 2011 20:51:42 +0000 (20:51 +0000)]
typo in format string for 1070660

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

13 years agoLog a hint about the directory needing to be executable
Eric Covener [Mon, 14 Feb 2011 20:49:56 +0000 (20:49 +0000)]
Log a hint about the directory needing to be executable
when we hit EACCESS searching for htaccess files.

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

13 years agofix compile failure in r1070616
Jeff Trawick [Mon, 14 Feb 2011 20:01:52 +0000 (20:01 +0000)]
fix compile failure in r1070616

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

13 years agofix theoretical const issue in call to strchr()
Jeff Trawick [Mon, 14 Feb 2011 19:47:31 +0000 (19:47 +0000)]
fix theoretical const issue in call to strchr()

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

13 years agoDocument pre_read_request and bump mmn
Jim Jagielski [Mon, 14 Feb 2011 19:25:37 +0000 (19:25 +0000)]
Document pre_read_request and bump mmn

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

13 years agoNew hook: ap_run_pre_read_request()
Jim Jagielski [Mon, 14 Feb 2011 19:21:37 +0000 (19:21 +0000)]
New hook: ap_run_pre_read_request()

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

13 years agoMention ap_state_query() in the new API docs
Stefan Fritsch [Sun, 13 Feb 2011 22:44:27 +0000 (22:44 +0000)]
Mention ap_state_query() in the new API docs

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

13 years agoFix two bugs introduced by r1070153
Stefan Fritsch [Sun, 13 Feb 2011 22:34:02 +0000 (22:34 +0000)]
Fix two bugs introduced by r1070153

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

13 years agomod_cache: When a request other than GET or HEAD arrives, we must
Graham Leggett [Sun, 13 Feb 2011 02:03:29 +0000 (02:03 +0000)]
mod_cache: When a request other than GET or HEAD arrives, we must
invalidate existing cache entities as per RFC2616 13.10. PR 15868.

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

13 years agomod_cache: Make sure that the moving of the CACHE filter to another
Graham Leggett [Sat, 12 Feb 2011 23:21:18 +0000 (23:21 +0000)]
mod_cache: Make sure that the moving of the CACHE filter to another
point within a subrequest is limited to affecting filters in that
subrequest only.

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

13 years agoUse ap_state_query() to fix many modules that were not correctly initializing
Stefan Fritsch [Sat, 12 Feb 2011 21:23:56 +0000 (21:23 +0000)]
Use ap_state_query() to fix many modules that were not correctly initializing
if they were not active during server startup but got enabled later during a
graceful restart (in which case they need to do all work during a single
config run).

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

13 years agoCreate new ap_state_query() function that allows modules to determine
Stefan Fritsch [Sat, 12 Feb 2011 21:18:32 +0000 (21:18 +0000)]
Create new ap_state_query() function that allows modules to determine
if the current configuration run is the initial one at server startup,
and if the server is started for testing/config dumping only.

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

13 years agomod_cache: When a bad Expires date is present, we need to behave as if
Graham Leggett [Sat, 12 Feb 2011 19:02:58 +0000 (19:02 +0000)]
mod_cache: When a bad Expires date is present, we need to behave as if
the Expires is in the past, not as if the Expires is missing. PR 16521.

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

13 years agoLog something nicer than "Internal error: pcfg_openfile() called
Stefan Fritsch [Sat, 12 Feb 2011 15:52:17 +0000 (15:52 +0000)]
Log something nicer than "Internal error: pcfg_openfile() called
with NULL filename" if no password file is configured

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

13 years ago* docs/manual/mod/: Play language lawyer with the SSL_*_DN_*_n variable
Joe Orton [Sat, 12 Feb 2011 15:41:17 +0000 (15:41 +0000)]
* docs/manual/mod/: Play language lawyer with the SSL_*_DN_*_n variable
  description.

PR: 45875

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

13 years agomod_cache: We must ignore quoted-string values that appear in a
Graham Leggett [Sat, 12 Feb 2011 13:08:57 +0000 (13:08 +0000)]
mod_cache: We must ignore quoted-string values that appear in a
Cache-Control header. PR 50199.

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

13 years agorevert r1026746:
Stefan Fritsch [Sat, 12 Feb 2011 12:16:18 +0000 (12:16 +0000)]
revert r1026746:

    If an unknown Content-* header is received for a PUT request, we must not
    ignore it but reply with 501 per RFC 2616 9.6.

    PR: 42978

Vetoed by Roy T. Fielding:
http://mail-archives.apache.org/mod_mbox/httpd-dev/201102.mbox/%3C9A5A8B62-ED16-4BD3-97DA-8475026BB81D@gbiv.com%3E

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

13 years agoReinstate comment.
Graham Leggett [Fri, 11 Feb 2011 20:30:04 +0000 (20:30 +0000)]
Reinstate comment.

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

13 years agomod_cache: Respect s-maxage as described by RFC2616 14.9.3, which must
Graham Leggett [Fri, 11 Feb 2011 20:12:39 +0000 (20:12 +0000)]
mod_cache: Respect s-maxage as described by RFC2616 14.9.3, which must
take precedence if present. PR 35247.

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

13 years ago* Play safe if the notes table does not contain an SSL_connect_rv key.
Ruediger Pluem [Fri, 11 Feb 2011 12:50:31 +0000 (12:50 +0000)]
* Play safe if the notes table does not contain an SSL_connect_rv key.

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

13 years ago* modules/ssl/ssl_engine_pphrase.c (ssl_pphrase_Handle): Fix possible
Joe Orton [Fri, 11 Feb 2011 12:26:57 +0000 (12:26 +0000)]
* modules/ssl/ssl_engine_pphrase.c (ssl_pphrase_Handle): Fix possible
  startup failure in cases where multiple vhosts share the same
  "vhost-id" and private key file.  The cached-key case would
  previously cause an abrupt return from the function, which could
  prevent processing of configured keypairs for other vhosts.  There
  is no apparent reason to check for a "cache hit" against cached keys
  using *any* algorithm types; instead only check against a key with
  the matching type.

Submitted by: Masahiro Matsuya <matsuya redhat.com>, jorton

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

13 years ago* modules/ssl/ssl_engine_pphrase.c (ssl_pphrase_Handle): Simplify to
Joe Orton [Fri, 11 Feb 2011 12:05:31 +0000 (12:05 +0000)]
* modules/ssl/ssl_engine_pphrase.c (ssl_pphrase_Handle): Simplify to
  calculate hash index only once per loop iteration; no (intended)
  functional change.  Add comments and tweak a log message.

* modules/ssl/ssl_private.h: Add comments.

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

13 years ago* modules/ssl/ssl_private.h: Clarify comment on modssl_pk_server_t.
Joe Orton [Fri, 11 Feb 2011 09:48:00 +0000 (09:48 +0000)]
* modules/ssl/ssl_private.h: Clarify comment on modssl_pk_server_t.

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

13 years agomove function...
Jim Jagielski [Thu, 10 Feb 2011 13:29:53 +0000 (13:29 +0000)]
move function...

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

13 years agoUpdates.
Lucien Gentis [Wed, 9 Feb 2011 17:02:01 +0000 (17:02 +0000)]
Updates.

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

13 years agoUgg... unbalanced workers *do* need a mutex as well (good catch Rüdiger!)
Jim Jagielski [Wed, 9 Feb 2011 13:20:09 +0000 (13:20 +0000)]
Ugg... unbalanced workers *do* need a mutex as well (good catch Rüdiger!)

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

13 years agotypo
Jim Jagielski [Wed, 9 Feb 2011 13:00:00 +0000 (13:00 +0000)]
typo

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

13 years agoSquash error/warning about signed/unsigned comparison
Jim Jagielski [Wed, 9 Feb 2011 12:56:01 +0000 (12:56 +0000)]
Squash error/warning about signed/unsigned comparison

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

13 years ago* Fix syntax errors and a non existing variable.
Ruediger Pluem [Wed, 9 Feb 2011 08:21:36 +0000 (08:21 +0000)]
* Fix syntax errors and a non existing variable.

Submitted by: NormW <normw gknw.net>
Reviewed by: rpluem

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

13 years ago* Make module compile by fixing some typos.
Ruediger Pluem [Wed, 9 Feb 2011 08:03:40 +0000 (08:03 +0000)]
* Make module compile by fixing some typos.

PR: 50735
Submitted by: Mark Montague <mark catseye.org>
Reviewed by: rpluem

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

13 years agoRPM spec file: Make the httpd init script consistent with the htcacheclean
Graham Leggett [Tue, 8 Feb 2011 22:51:31 +0000 (22:51 +0000)]
RPM spec file: Make the httpd init script consistent with the htcacheclean
init script. Multiple daemons can be started by creating symlinks to the
init script.

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

13 years agoRemove the thread mutex from the worker... it really should be
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

13 years agoExpose this as part of the API. That way, other code/modules
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

13 years ago* server/mpm/prefork/prefork.c (stop_listening, sig_term, restart):
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

13 years agoRebuild transformations.
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

13 years agoCustom, not Customer, error docs.
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

13 years agoOnly persist if we want it to
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

13 years agoOK, use faster, shared version... makes sense to persist this
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

13 years agoKeep track of how many workers we've used so far... no need
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

13 years agoSave this for later to be done... recall that .free needs to
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

13 years agoSlotmem now provides for the number of "free" slots
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

13 years agoMutex around adding a new worker...
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

13 years agotest_char.h is a dependency, not a source. This seems to fix the occasional
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

13 years agorevert r1066944, r1067177 for now
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

13 years agoUpdates.
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

13 years agoLock around the time when we're mucking w/ balancers...
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

13 years agoHere we go... we can now, via balancer-manager, add new
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

13 years agomight as well allow for the sticky session to be adjusted as well...
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

13 years agoOops.... we need to adjust sticky, which is an array now
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

13 years agoupdate convmap
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

13 years agoAnd yet more balancer params that can be changed at runtime via
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

13 years agoUntil this is fixed to link in lresolv, exclude.
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

13 years agoReload resolv.conf on graceful restarts
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