delta/apache/httpd.git/server/core.c, branch httpd-2.2-proxy

Merge r420307 from trunk:

2008-06-02T21:18:18+00:00

* Add the filename of the configuration file to the warning message
  about the useless use of AllowOverride.

PR: 39992
Submitted by: Darryl Miles 
Reviewed by: rpluem, jim, pquerna


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662566 13f79535-47bb-0310-9956-ffa450edef68

Merge r652885 from trunk:

2008-05-27T16:25:19+00:00

* Do not allow all options of ALL to be set when only a few of them are
  allowed.

PR: 44262
Submitted by: Micha?\197?\130 Grz?\196?\153dzicki 
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660585 13f79535-47bb-0310-9956-ffa450edef68

Merge 557837, 557972 from trunk:

2007-11-29T20:21:10+00:00

Multiple trivial fixes from Christophe JAILLET
PR 38699, 39518, 42005, 42006, 42007, 42008, 42009
The patches are all his, and are sufficiently trivial to review
at a glance.

Fix clash between r557837 and r427780

PR: 38699, 39518, 42005, 42006, 42007, 42008, 42009
Submitted by: Christophe Jaillet 
Reviewed by: rpluem, trawick, niq


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@599569 13f79535-47bb-0310-9956-ffa450edef68

Apply backport... fix "conflicts" with CHANGES and ap_mmn.h

2007-11-15T22:08:30+00:00

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@595474 13f79535-47bb-0310-9956-ffa450edef68

Merge r589177 from trunk:

2007-10-29T13:13:17+00:00

Fix possible crash at startup in case of nonexistent DocumentRoot.
PR#39722

Submitted by: niq
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@589618 13f79535-47bb-0310-9956-ffa450edef68

Merge r562860 from trunk:

2007-08-07T12:12:20+00:00

* Avoid that relative changes to Options change the settings for FileETag.
  This does NOT address the remaining issues with relative settings and
  FileETag mentioned in PR 42027, but at least it isolates the problem
  to them. Currently these issues can be worked around with absolute
  settings.

PR: 42027
Submitted by: Rici Lake 
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@563468 13f79535-47bb-0310-9956-ffa450edef68

merge from trunk (but preserve ap_get_server_version()):

2006-09-15T13:19:25+00:00

  *) The full server version information is now included in the error log at
     startup as well as server status reports, irrespective of the setting
     of the ServerTokens directive.  ap_get_server_version() is now 
     deprecated, and is replaced by ap_get_server_banner() and 
     ap_get_server_description().

Reviewed by: rpluem, jim



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@446606 13f79535-47bb-0310-9956-ffa450edef68

Merge r399947, r406697 from trunk:

2006-07-24T13:34:19+00:00

* Add optional 'scheme://' prefix to ServerName directive.  For
  'https', mod_http returns "https" for the ap_hook_http_scheme and
  DEFAULT_HTTPS_PORT for ap_hook_default_port.  This fixes Redirect
  responses to requests for directories without a trailing slash
  when httpd runs behind a proxy or offload device that processes
  SSL.  It also enables support for Subversion in that
  configuration.  This change is completely backwards compatible
  and passes the perl-framework.  Minor mmn bump because I add a
  field to server_rec.

* Document r399947, addition of optional scheme:// to ServerName directive

PR: 33398
Submitted by: sctemme
Reviewed by: sctemme, rpluem, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425051 13f79535-47bb-0310-9956-ffa450edef68

update license header text

2006-07-12T03:38:44+00:00

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@421103 13f79535-47bb-0310-9956-ffa450edef68

Revert r395231 from the 2.2.x branch. This gets us back to the old place with regard to the copyright statements.

2006-04-22T01:53:06+00:00

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396056 13f79535-47bb-0310-9956-ffa450edef68