1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

268 Commits

Author SHA1 Message Date
Joshua Slive
86319c427d Allow the typical non-DAV methods to be unrestricted
in our DAV examples (in particular, POST).  Also
change <Location> to <Directory> in the docs.  This
particular example was not a security problem because
<Location> was being used to *extend* access, rather than
to *restrict* access, but it is better to encourage
people to use <Directory> by default.

PR: 40030


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@433694 13f79535-47bb-0310-9956-ffa450edef68
2006-08-22 17:07:54 +00:00
Joshua Slive
e883ab9941 Finish reverting r410758.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@424824 13f79535-47bb-0310-9956-ffa450edef68
2006-07-23 21:23:49 +00:00
Joshua Slive
af0dfff806 Use the 2.3-style access control properly (I hope).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@424819 13f79535-47bb-0310-9956-ffa450edef68
2006-07-23 21:10:05 +00:00
Joshua Slive
6cfe3d548e Backout r410758 because DavLockDB needs to point to an httpd-writable
directory and @exp_runtimedir@ doesn't qualify.  Also document a
missing module requirement.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@424817 13f79535-47bb-0310-9956-ffa450edef68
2006-07-23 21:00:58 +00:00
William A. Rowe Jr
270ee6c5f5 Provide vhosts examples remotely related to the httpd.conf we create?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410762 13f79535-47bb-0310-9956-ffa450edef68
2006-06-01 05:43:16 +00:00
William A. Rowe Jr
64ef8a43de That's the point, isn't it? All mpm's in one basket?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410761 13f79535-47bb-0310-9956-ffa450edef68
2006-06-01 05:42:13 +00:00
William A. Rowe Jr
507b817e5e Ewww... can't we be consistant with our workfiles paths?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410758 13f79535-47bb-0310-9956-ffa450edef68
2006-06-01 05:41:28 +00:00
William A. Rowe Jr
6dd46203d7 Add example/default allow-from for localhost, please???
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410757 13f79535-47bb-0310-9956-ffa450edef68
2006-06-01 05:40:34 +00:00
Joshua Slive
0e91e9e60b Use HTMLTable option in the config example so that directory listings will satisfy
people concerned about html spec compliance.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@371933 13f79535-47bb-0310-9956-ffa450edef68
2006-01-24 14:44:03 +00:00
Bradley Nicholes
9fed4c73d7 Authz refactoring
Merge from branches/authz-dev

Basically here is a list of what has been done:
- Convert all of the authz modules from hook based to provider based
- Remove the ap_requires field from the core_dir_config structure
- Remove the function ap_requires() since its functionality is no
longer supported or necessary in the refactoring
- Remove the calls to ap_some_auth_required() in the core request
handling to allow the  hooks to be called in all cases.
- Add the new module mod_authz_core which will act as the authorization
provider vector and contain common authz directives such as 'Require',
'Reject' and  '<RequireAlias>'
- Add the new module mod_authn_core which will contain common
authentication directives such as 'AuthType', 'AuthName' and
'<AuthnProviderAlias>'
- Move the check for METHOD_MASK out of the authz providers and into
the authz_core provider vector
- Define the status codes that can be returned by the authz providers
as AUTHZ_DENIED,  AUTHZ_GRANTED and AUTHZ_GENERAL_ERROR   
- Remove the 'Satisfy' directive 
- Implement the '<RequireAll>', '<RequireOne>' block directives  to
handle the 'and' and 'or' logic for authorization.
- Remove the 'AuthzXXXAuthoritative' directives from all of the authz
providers
- Implement the 'Reject' directive that will deny authorization if the
argument is true
- Fold the 'Reject' directive into the '<RequireAll>', '<RequireOne>'
logic
- Reimplement the host based authorization functionality provided by 
'allow', 'deny' and 'order' as authz providers   
- Remove the 'allow', 'deny' and 'order' directives      
- Merge mod_authn_alias into mod_authn_core
- Add '<RequireAlias>' functionality which is similar to
'<AuthnProviderAlias>' but specific to authorization aliasing
- Remove all of the references to the 'authzxxxAuthoritative'
directives from the documentation
- Remove the 'Satisfy' directive from the documentation
- Remove 'Allow', 'Deny', 'Order' directives from the documentation
- Document '<RequireAll>', '<RequireOne>', 'Reject' directives
- Reimplement the APIs ap_auth_type(), ap_auth_name() as optional
functions and move the  actual implementation into mod_authn_core
- Reimplement the API ap_some_auth_required() as an optional function
and move the  actual implementation into mod_authz_core

Major Changes:
- Added the directives <RequireAll>, <RequireOne>, <RequireAlias>,
Reject
- Expanded the functionality of the directive 'Require' to handle all
authorization and access control
- Added the new authz providers 'env', 'ip', 'host', 'all' to handle
host-based access control
- Removed the directives 'Allow', 'Deny', 'Order', 'Satisfy',
'AuthzXXXAuthoritative'
- Removed the ap_require() API
- Moved the directives 'AuthType', 'AuthName' out of mod_core and into
mod_authn_core
- Moved the directive 'Require' out of mod_core and into
mod_authz_core
- Merged mod_authn_alias into mod_authn_core
- Renamed mod_authz_dbm authz providers from 'group' and 'file-group'
to 'dbm-group' and 'dbm-file-group'

Benefits:
- All authorization and access control is now handle through two
directives, 'Require' and 'Reject'
- Authorization has been expanded to allow for complex 'AND/OR' control
logic through the directives '<RequireAll>' and '<RequireOne>'
- Configuration is now much simpler and consistent across the board
- Other modules like mod_ssl and mod_proxy should be able to plug into
and take advantage of  the same provider based authorization mechanism
by implementing their own providers

Issues:
- Backwards compatibility between 2.2 and 2.3 configurations will be
broken in the area  of authorization and access control due to the fact
that the directives 'allow', 'deny',  'order' and 'satisfy' have been
removed.  When moving from 2.2 to 2.3 these directives  will have to be
changed to 'Require all granted', 'Require all denied' or some variation
 of the authz host-based providers.
- Existing third party authorization modules will have to adapt to the
new structure.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@368027 13f79535-47bb-0310-9956-ffa450edef68
2006-01-11 14:30:28 +00:00
Joshua Slive
d61faa3ebe Some config file changes:
- Make the <Files> section safer by
  adding Satisfy all (as is already present in 1.3)

- Remove some handler examples that almost nobody will
  use (the config file is not the documentation)

- Remove some win32 specific stuff from the default
  config, since win32 uses its own config file

- Remove the config section for the perchild mpm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349747 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 16:08:01 +00:00
André Malo
0550e8f49c centralize the versioning of the httpd and the docs directories
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@333005 13f79535-47bb-0310-9956-ffa450edef68
2005-11-13 14:11:48 +00:00
Colm MacCarthaigh
5f4f3233d4 These days in most cases, "all bound IP addresses" means :: and 0.0.0.0
or even just ::. Rather than confuse users by trying to explain this in
the configuration, simply remove the now-erroneous reference to 0.0.0.0. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327892 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 00:43:40 +00:00
Martin Kraemer
96948a8f85 Typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290940 13f79535-47bb-0310-9956-ffa450edef68
2005-09-22 13:22:51 +00:00
Wilfredo Sanchez
18aa2b57f8 Using the user nobody (or similar accounts on other systems like
nouser) violates the purpose of that user.  User nobody exists
specifically as a user that no process runs as and that owns no files
on disk.  Same for nogroup.

The user and group daemon are the generic system services user and
group.  Use those instead.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@220032 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 10:46:31 +00:00
Joe Orton
61248dbf3f Add redirect-carefully for Dreamweaver MX.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@201583 13f79535-47bb-0310-9956-ffa450edef68
2005-06-24 08:45:09 +00:00
Joe Orton
ac48c6b810 PHP 3.x + httpd-2.2 seems... unlikely.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190906 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 12:52:57 +00:00
Rich Bowen
0e5a55be8b Change "Files ~" to the preferred "FilesMatch"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190905 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 12:42:32 +00:00
Joshua Slive
5d2f77b59a Reverse r168030 because the not-acceptable (406)
custom error doc can't provide all the information
provided by the internal doc.  Also delete the corresponding
.html.var file to avoid future confusion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178453 13f79535-47bb-0310-9956-ffa450edef68
2005-05-25 15:20:55 +00:00
Erik Abele
8ceb063d94 WebDAVFS (1.3) is still broken in OS X Tiger.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170662 13f79535-47bb-0310-9956-ffa450edef68
2005-05-17 21:01:37 +00:00
Joshua Slive
23ea0cd2c0 Missing ErrorDocument line for Not Acceptable.
PR: 28581


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168028 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 00:23:48 +00:00
Joe Orton
440083dd9c - don't allow PROPFIND in the default config for public_html directories
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@164763 13f79535-47bb-0310-9956-ffa450edef68
2005-04-26 07:51:11 +00:00
Joe Orton
cda74843ef * docs/conf/extra/httpd-ssl.conf.in: Don't reference directories which
aren't created by "make install".  Use BrowserMatch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161883 13f79535-47bb-0310-9956-ffa450edef68
2005-04-19 13:09:43 +00:00
Joshua Slive
32205b5219 Fix the logfile names in windows to have a .log extension.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161777 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 17:20:11 +00:00
Joe Orton
9a4b700af6 Add redirect-carefully BrowserMatch for FrontPage.
PR: 32842 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161475 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 14:41:53 +00:00
Rich Bowen
6efa778213 As discussed on the list, change the default setting for
KeepAliveTimeout from 15 seconds to 5 seconds.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161140 13f79535-47bb-0310-9956-ffa450edef68
2005-04-13 01:21:11 +00:00
Joshua Slive
ead8a4b2c6 Bring the windows config file in line with the simplifications
of the main httpd.conf.

Make a vain attempt to modify Makefile.win appropriately.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160989 13f79535-47bb-0310-9956-ffa450edef68
2005-04-12 00:12:14 +00:00
Bradley Nicholes
b947afe0d8 Missing a space delimiter between the values
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160724 13f79535-47bb-0310-9956-ffa450edef68
2005-04-09 23:59:26 +00:00
Joshua Slive
fa4e866600 Merged the simple-conf branch changes r159781:160695 into the trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160696 13f79535-47bb-0310-9956-ffa450edef68
2005-04-09 16:59:15 +00:00
Sander Striker
c312a18db5 * docs/conf/httpd-win.conf
Reformat.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160584 13f79535-47bb-0310-9956-ffa450edef68
2005-04-08 19:02:12 +00:00
William A. Rowe Jr
3d89009576 Need to update the default conf.
Submitted for your consideration - does 

    AddHandler imap-file map

  make sense anymore?  or should the handler be imagemap-file?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160436 13f79535-47bb-0310-9956-ffa450edef68
2005-04-07 19:01:26 +00:00
Sander Striker
359a77ca1b * docs/conf/httpd-std.conf.in
Adjust one conditional to new style.
  Wrap mod_logio directives into a conditional, instead of having them commented out.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159499 13f79535-47bb-0310-9956-ffa450edef68
2005-03-30 17:47:02 +00:00
Sander Striker
f8354dc777 Stop exposing source filenames in the configuration files.
* docs\conf\httpd-win.conf
* docs\conf\httpd-std.conf.in

  Replace all occurences of *.c with *_module within
  IfModule clauses, as pointed out by Paul Querna to
  be possible nowadays.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152951 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 22:31:56 +00:00
Erik Abele
947d103c02 Sync available error languages with used LanguagePriority.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124607 13f79535-47bb-0310-9956-ffa450edef68
2005-01-08 02:21:30 +00:00
André Malo
b74e119fee update config for pt-br inclusion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124362 13f79535-47bb-0310-9956-ffa450edef68
2005-01-06 11:22:56 +00:00
Roy T. Fielding
bbb4bfda2c Remove AddDefaultCharset from the default configuration because
setting a site-wide default does more harm than good.

PR: 23421



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111581 13f79535-47bb-0310-9956-ffa450edef68
2004-12-11 05:57:29 +00:00
André Malo
61c4312eb2 general property cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105995 13f79535-47bb-0310-9956-ffa450edef68
2004-11-20 20:16:24 +00:00
Joe Orton
c36ecfa64f Remove the .cvsignore files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 09:07:29 +00:00
Joe Orton
a0694d5efe - switch default session cache to shmcb
- remove comment on using shmht which has been removed


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105742 13f79535-47bb-0310-9956-ffa450edef68
2004-11-10 15:50:05 +00:00
Joe Orton
0913e5ddcc * docs/conf/magic: Remove trailing whitespace.
PR: 31472
Submitted by: Jack Repenning


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105671 13f79535-47bb-0310-9956-ffa450edef68
2004-11-02 23:34:35 +00:00
Mladen Turk
9a9b58afe1 Add proxy_ajp and proxy_balancer to the LoadModule list.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105103 13f79535-47bb-0310-9956-ffa450edef68
2004-09-13 10:32:19 +00:00
Bradley Nicholes
a8f1d701b6 Move charset.conv configuration file out of experimental and into docs/conf. This file holds the character set conversion table used by the authn_ldap provider.
See Attic in experimental directory for previous change history.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104722 13f79535-47bb-0310-9956-ffa450edef68
2004-08-18 22:56:46 +00:00
Nick Kew
ea15a23ccf Remove duplicate AddCharsets (both old and new:-)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104445 13f79535-47bb-0310-9956-ffa450edef68
2004-08-02 12:23:44 +00:00
Nick Kew
027251a610 Fix Bug 22684 and add some additional charsets.
Provides a better workaround for Bug 23421.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104444 13f79535-47bb-0310-9956-ffa450edef68
2004-08-02 11:28:04 +00:00
Sander Striker
6adbfe9107 * docs/conf/httpd-std.conf.in
* docs/conf/httpd-win.conf

  Add XML Spy to the clients who need to be carefully redirected.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104300 13f79535-47bb-0310-9956-ffa450edef68
2004-07-15 19:28:06 +00:00
Greg Stein
fe06293aa3 msg
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104298 13f79535-47bb-0310-9956-ffa450edef68
2004-07-15 19:22:25 +00:00
Joe Orton
4ea42b6e3b Drop support for the "CompatEnvVars" argument to SSLOptions, which was
never implemented in 2.0 and never needed to be.

* docs/ssl/ssl-std.conf.in: Remove CompatEnvVars examples.

* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLOptions): Don't allow
the CompatEnvVars argument.

* modules/ssl/ssl_private.h: Remove SSL_OPT_COMPATENVVARS macro.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103829 13f79535-47bb-0310-9956-ffa450edef68
2004-06-03 09:28:12 +00:00
André Malo
ec6cfa321f incorporate Spanish translation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103489 13f79535-47bb-0310-9956-ffa450edef68
2004-04-23 22:47:59 +00:00
Bradley Nicholes
ac2a7b6fb5 Add maxmemfree as a default for the netware mpm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102866 13f79535-47bb-0310-9956-ffa450edef68
2004-03-05 19:31:24 +00:00
André Malo
607f7d3cc5 fix type of .rm extension
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102723 13f79535-47bb-0310-9956-ffa450edef68
2004-02-21 15:11:33 +00:00