summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix properties, add missing transformed files and update transformationAndré Malo2006-01-15282-1616/+1996
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@369240 13f79535-47bb-0310-9956-ffa450edef68
* Adding updated mod_ssl HOWTO to the websiteNoirin Plunkett2006-01-15208-1271/+701
| | | | | | | Also committing transforms with new (2006) copyright notice. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@369229 13f79535-47bb-0310-9956-ffa450edef68
* Rewrite of the mod_ssl HOWTO - only language changes, no code changes.Noirin Plunkett2006-01-151-70/+79
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@369201 13f79535-47bb-0310-9956-ffa450edef68
* eliminate the import of the ap_satisfies optional function on every request. ↵Bradley Nicholes2006-01-152-7/+18
| | | | | | Just import it once if it exists. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@369124 13f79535-47bb-0310-9956-ffa450edef68
* clean up some left-over debugging code and commentsBradley Nicholes2006-01-143-17/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@368978 13f79535-47bb-0310-9956-ffa450edef68
* host access control compatibility module (Order, Deny, Allow, Satisfy)Bradley Nicholes2006-01-141-0/+392
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@368932 13f79535-47bb-0310-9956-ffa450edef68
* Restore Order, Deny, Allow, Satisfy for backwards compatibility with authzBradley Nicholes2006-01-144-5/+58
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@368929 13f79535-47bb-0310-9956-ffa450edef68
* * Sync with 2.2.x STATUS fileRuediger Pluem2006-01-131-6/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@368887 13f79535-47bb-0310-9956-ffa450edef68
* Drop redundant dependency, ms studio is quite good at resolvingWilliam A. Rowe Jr2006-01-131-3/+0
| | | | | | | | | nested dependencies (unless the dependency is consumed by both modules.) See mod_ldap for a similar example. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@368540 13f79535-47bb-0310-9956-ffa450edef68
* Say 'whoops'. When you build the elements explicitly, you must orderWilliam A. Rowe Jr2006-01-131-3/+3
| | | | | | | them (win32 has no unresolved symbols linkage). modules/database/ is required before modules/aaa/ git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@368538 13f79535-47bb-0310-9956-ffa450edef68
* Make some error checking more clear by using the defined constants insteadGarrett Rooney2006-01-121-5/+5
| | | | | | | | | | | | | of literal values. Patch by: Dan Rall <dlr apache.org> * server/request.c (ap_process_request_internal): Check the return value of hook functions against the constant OK instead of the magic number 0 to improve clarity. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@368505 13f79535-47bb-0310-9956-ffa450edef68
* An unambigous cast, if limit is <0 it's unlimited.William A. Rowe Jr2006-01-121-2/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@368443 13f79535-47bb-0310-9956-ffa450edef68
* Determined that yes; apr_general.h may be included in .rc files,William A. Rowe Jr2006-01-123-24/+25
| | | | | | | | | | | | so eliminate a substitute declaration. Correct version and copyright generation, this involves 'long line' flavor of the first ASF copyright line; next step will be no more awk generation of .rc files, so there we will use the new macro AP_SERVER_COPYRIGHT and defined tokens from this file for versions. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@368395 13f79535-47bb-0310-9956-ffa450edef68
* Update the NetWare makefiles to build the authz codeBradley Nicholes2006-01-114-6/+27
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@368105 13f79535-47bb-0310-9956-ffa450edef68
* Correct version numbering for generated .rc files.William A. Rowe Jr2006-01-111-16/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@368072 13f79535-47bb-0310-9956-ffa450edef68
* Authz refactoringBradley Nicholes2006-01-1145-1953/+3208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* * Fix PR38017 by handling the selection of the hostname in the same way forRuediger Pluem2006-01-102-3/+21
| | | | | | | | | | | | | | | | | | | | | | non proxied and reverse proxied requests. We need to handle both cases in the same manner as for the reverse proxy case we have the following situation: If a cached entry is looked up by mod_cache's quick handler r->proxyreq is still unset in the reverse proxy case as it only gets set in the translate name hook (either by ProxyPass or mod_rewrite) which is run after the quick handler hook. This is different to the forward proxy case where it gets set before the quick handler is run (in the post_read_request hook). If a cache entry is created by the CACHE_SAVE filter we always have r->proxyreq set correctly. So we must ensure that in the reverse proxy case we use the same code path and using the canonical name seems to be the right thing to do in the reverse proxy case. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@367798 13f79535-47bb-0310-9956-ffa450edef68
* Update copyright current year to 2006Nick Kew2006-01-101-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@367477 13f79535-47bb-0310-9956-ffa450edef68
* sync.Hiroaki Kawai2006-01-091-2/+12
| | | | | | English Revision: 349917 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@367302 13f79535-47bb-0310-9956-ffa450edef68
* sync.Hiroaki Kawai2006-01-091-42/+36
| | | | | | English Revision: 350286 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@367297 13f79535-47bb-0310-9956-ffa450edef68
* sync.Hiroaki Kawai2006-01-091-3/+6
| | | | | | English Revision: 333005 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@367296 13f79535-47bb-0310-9956-ffa450edef68
* Sync.Hiroaki Kawai2006-01-091-4/+4
| | | | | | English Revision: 290816 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@367270 13f79535-47bb-0310-9956-ffa450edef68
* symc.Hiroaki Kawai2006-01-091-5/+5
| | | | | | English revision: 327999 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@367265 13f79535-47bb-0310-9956-ffa450edef68
* Explain how we're checking to see if ap_proxy_backend_broke()Jim Jagielski2006-01-061-1/+2
| | | | | | | has been called or not. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@366558 13f79535-47bb-0310-9956-ffa450edef68
* Clarify (I hope) the comment better :)Jim Jagielski2006-01-061-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@366554 13f79535-47bb-0310-9956-ffa450edef68
* As long as we have the AP_BUCKET_IS_ERROR macro, let's use itJim Jagielski2006-01-061-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@366374 13f79535-47bb-0310-9956-ffa450edef68
* Update status before we run the logging hookJim Jagielski2006-01-051-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@366337 13f79535-47bb-0310-9956-ffa450edef68
* * Call ap_proxy_http_cleanup after ap_log_rerror because it resetsRuediger Pluem2006-01-051-1/+1
| | | | | | | backend->hostname to NULL. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@366279 13f79535-47bb-0310-9956-ffa450edef68
* * Fix a regression from 2.2.x: Set c->aborted to 1 if the return code fromRuediger Pluem2006-01-051-0/+10
| | | | | | | | writing to the client is different from APR_SUCCESS in the blocking case or APR_SUCCESS or APR_EAGAIN in the non blocking case. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@366278 13f79535-47bb-0310-9956-ffa450edef68
* * If a subrequest has a broken backend also set no_cache for the main requestRuediger Pluem2006-01-052-5/+20
| | | | | | | | | | | | | | | | | and ensure that the chunk filter does not sent the last chunk marker in this case. modules/http/chunk_filter.c: Memorize HTTP_BAD_GATEWAY error buckets that had been seen in filter context to ensure that we do not sent the last chunk marker in this case. modules/proxy/proxy_util.c : Set no_cache also for main request if we are a subrequest. Thanks to Joe Orton and André Malo for the "invented unique pointer" trick. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@366181 13f79535-47bb-0310-9956-ffa450edef68
* * Correctly signal broken backend connections up the chain also for the ajpRuediger Pluem2006-01-024-9/+65
| | | | | | | | | | | | | | | backend (see also r357461). Furthermore move common code in mod_proxy_http.c and mod_proxy_ajp.c into a new function (ap_proxy_backend_broke) in proxy_util.c. modules/proxy/mod_proxy_ajp.c : Signal broken backend connection for ajp backend modules/proxy/proxy_util.c : Add ap_proxy_backend_broke modules/proxy/mod_proxy_http.c: - Use ap_proxy_backend_broke - Return DONE also if backend broke modules/proxy/mod_proxy.h : Add declaration of ap_proxy_backend_broke git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@365374 13f79535-47bb-0310-9956-ffa450edef68
* PR#38084Nick Kew2006-01-011-1/+1
| | | | | | | | | | | | Correct DBDParams string in example INOUE Seiichiro (who reported the bug) suggests referencing the pgsql documentation. I disagree, but I wonder if PgSQL is really a good choice of example, since it (untypically) parses the params itself rather than have the apr_dbd driver do it. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@360505 13f79535-47bb-0310-9956-ffa450edef68
* Refactoring of ap_read_request() to store partial request stateBrian Pane2005-12-314-268/+296
| | | | | | | | | in the request rec. The point of this is to allow asynchronous MPMs do do nonblocking reads of requests. (Backported from the async-read-dev branch) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@360461 13f79535-47bb-0310-9956-ffa450edef68
* Removed the destruction of the bucket allocator prior toBrian Pane2005-12-311-1/+0
| | | | | | | | | | | clearing the transaction pool. The bucket allocator will now get destroyed when apr_pool_clear() invokes its cleanup callback. With the old logic, memory corruption was possible if the pool contained any brigades that referenced any buckets allocated from the bucket allocator. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@360257 13f79535-47bb-0310-9956-ffa450edef68
* General cleanup: Sander Temme2005-12-301-18/+28
| | | | | | | | | | | | | | | * Change version number to 2.3 * Change documentation links to new layout * Updated, concise but hopefully correct discussion of build system behaviour w.r.t. threads on FreeBSD * A little more discussion of buildconf and minimum libtool version on Darwin * More caveat on availability of Windows sourceballs and installers Initially submitted by pgolluci, subsequently kicked around some. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@359993 13f79535-47bb-0310-9956-ffa450edef68
* Small spelling fix.Graham Leggett2005-12-281-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@359565 13f79535-47bb-0310-9956-ffa450edef68
* Fix Cookie2 header problems that originates backMladen Turk2005-12-231-3/+3
| | | | | | from mod_jk. Cookie2 was always sent as Cookie. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@358769 13f79535-47bb-0310-9956-ffa450edef68
* Update 'apache_pb2' images for Apache-2.2 (NOTE: not for 2.3!)Martin Kraemer2005-12-213-0/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@358272 13f79535-47bb-0310-9956-ffa450edef68
* This shift was treated in 32 bit scope, then masked to 64 bits,William A. Rowe Jr2005-12-201-1/+1
| | | | | | which was probably quite uncool. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@358040 13f79535-47bb-0310-9956-ffa450edef68
* Morph the ap_http_broken_backend_filter() proxy "specific"Jim Jagielski2005-12-204-18/+23
| | | | | | | filter to a generic http error handling output filter. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@358022 13f79535-47bb-0310-9956-ffa450edef68
* Quiet warnings of POSIX deprecation in win32 support sources.William A. Rowe Jr2005-12-192-0/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357702 13f79535-47bb-0310-9956-ffa450edef68
* In Apache-2.x, the function is called apr_pstrdup().Martin Kraemer2005-12-191-7/+3
| | | | | | | The 'tmp' variable is not really necessary. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357699 13f79535-47bb-0310-9956-ffa450edef68
* Add our new eor_bucket.c module to libhttpdWilliam A. Rowe Jr2005-12-191-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357612 13f79535-47bb-0310-9956-ffa450edef68
* * Move code for broken backend detection out of core filter into a new httpRuediger Pluem2005-12-184-18/+38
| | | | | | | | protocol filter (ap_http_broken_backend_filter) that is only run in the proxy case. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357519 13f79535-47bb-0310-9956-ffa450edef68
* * If the mod_proxy backend connection broke in the middle of the response,Ruediger Pluem2005-12-185-12/+46
| | | | | | | | | | | | | | | | | | | | | then - Do not cache it. - Signal the client that something went wrong by closing the connection and not sending the last-chunk marker if the response was T-E chunked. server/core_filters.c : Close the connection to the client by setting c->keepalive to AP_CONN_CLOSE. modules/http/chunk_filter.c : Do not send last-chunk marker in the case the backend broke. modules/proxy/mod_proxy_http.c: Signal that the backend connection broke. modules/cache/mod_disk_cache.c: Respect r->no_cache for discarding the response Submitted by: Roy T. Fielding, Jim Jagielski, Ruediger Pluem Reviewed by: Roy T. Fielding, Jim Jagielski, Ruediger Pluem git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357461 13f79535-47bb-0310-9956-ffa450edef68
* * Resync with 2.0.x and 2.2.x CHANGES fileRuediger Pluem2005-12-181-10/+29
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357458 13f79535-47bb-0310-9956-ffa450edef68
* * Fix ap_http_chunk_filter to create correct chunks in the case that aRuediger Pluem2005-12-172-0/+5
| | | | | | | | | | flush bucket is pre- and postfixed by data buckets in the brigade. Submitted by: Ruediger Pluem Reviewed by: Justin Erenkrantz, Joe Orton, Jim Jagielski git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357328 13f79535-47bb-0310-9956-ffa450edef68
* Add the module details for our /base:@...,mod_foo.so magicWilliam A. Rowe Jr2005-12-161-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357234 13f79535-47bb-0310-9956-ffa450edef68
* A more generic explanationWilliam A. Rowe Jr2005-12-161-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357231 13f79535-47bb-0310-9956-ffa450edef68
* Test _NMAKE_VER define to determine nmake -nologo behavior,William A. Rowe Jr2005-12-161-7/+13
| | | | | | | and use $(MAKEOPT) -f syntax throughout to avoid problems on mingw, borland, etc. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357226 13f79535-47bb-0310-9956-ffa450edef68