Parent Directory
| 
Revision Log
| Links to HEAD: | (view) (annotate) |
| Sticky Revision: |
mod_alias: Ensure Redirect issues a valid URL PR 44020 Patch by Håkon Stordahl
Simplify... handle this below, even though it's after some possible expensive regex
typo
More adjustment for Redirect argument checking...
* Some custom defined response codes also do not require 3 arguments (all that are not redirects).
Fix error with arg counting
mod_alias: Enforce sanity in args to Redirect PR 44729
PR#35314: Enable path components in Redirect
update license header text
Update the copyright year in all .c, .h and .xml files
No functional Change: Removing trailing whitespace. This also means that "blank" lines consisting of just spaces or tabs are now really blank lines
Move the POSIX reg* implementations into the ap_* namespace; internalise the ap_reg*<->PCRE wrapper: * configure.in: Add srclib/pcre to the include path. * include/ap_regex.h: Renamed from include/pcreposix.h. Prefix all constants with AP_; prefix all functions and types with ap_. Define AP_DECLARE to nothing if necessary. Remove regcomp error codes. * include/httpd.h: Include ap_regex.h not pcreposix.h. (ap_pregcomp, ap_regexec, ap_regfree): s/regex_t/ap_regex_t/. (ap_regexec, ap_regerror): Prototypes moved to ap_regex.h. * server/util.c (regex_cleanup, ap_pregcomp, ap_pregsub, ap_pregfree): Adjust for ap_ prefixed types. (ap_regexec, ap_regerror): Removed. * server/Makefile.in: Build util_pcre.c. * server/util_pcre.c: Copied from srclib/pcre/pcreposix.c; remove use of PCRE-internals to do error mapping; rename types to add AP_/ap_ prefixes as above. Use APR includes. (ap_regerror): Use apr_snprintf. * srclib/pcre/Makefile.in: Don't build pcreposix.c into libpcre.la. * modules/*: Update to use new type and constant names. PR: 27750 (part one) Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton
Update copyright year to 2005 and standardize on current copyright owner line.
general property cleanup
emit the config filename when warning about overlapping aliases Submitted by: Guenter Knauf <eflash gmx.net> Reviewed by: Dirk-Willem van Gulik
fix name of The Apache Software Foundation
fix copyright dates according to the first check in
apply Apache License, Version 2.0
update license to 2004.
Fold in the CAN-2003-0542 regex patch.
When using Redirect in directory context, append requested query string if there's no one supplied by configuration. PR: 10961
quiet a gcc warning by adding () around && within ||
use a better text for the overlap warning. Submitted by: Joshua Slive
extend the check for Alias overlappings. Now test also previous (Script)AliasMatch commands.
people often assume that their Aliases will be found by "best match" rather than "first match". Throw out warnings, if there are obvious overlappings, e.g.: Alias /foo /somewhere Alias /foo/bar /elsewhere
finished that boring job: update license to 2003. Happy New Year! ;-))
Fix some hook ordering problems. mod_vhost_alias should, perhaps, be HOOK_LAST. It redefines the document root, so it should only be used if no other mapper wants the request. I haven't made that change here; I've simply put explict ordering to make sure we get mod_alias -> mod_userdir -> mod_vhost_alias I can't compile apache at the moment for other reasons, so this is untested, but it looks right to me. PR: 8853
Remove some extraneous comparison operations
The style police have arrested mod_alias on charges of violating law and order. It has been released after submitting to rehabilitation. (No functional changes.)
stop using APLOG_NOERRNO in calls to ap_log_[pr]error()
Reverse the hook ordering for mod_userdir and mod_alias so that Alias/ScriptAlias will override Userdir. PR: 8841 Reviewed by: Justin Erenkrantz
Eliminate potential ap_server_root_relative segfaults, with the input of Jeff Trawick's style changes to the first patches. Doesn't include the fixes to ssl [more complex], and we won't trap errors that involve ap_serverroot, since we presume that was normalized on the way in. Therefore, testing ap_server_root_relative(DEFAULT_FOO) cases should never become necessary.
Update our copyright for this year.
Change the 'we turned /foo into http://host/foo' log message to DEBUG; no reason to clutter people's log files with this when it's supported behaviour. Of course, they can find out about the performance impact by LogLeveling Debug. :-)
If the RedirectMatch target is an abs_path, make it an absoluteURI
Fix RedirectMatch so it won't emit invalid Location fields.
optimized away a strlen call in alias_matches()
Fix RedirectMatch handling to properly handle URLs with host portions. Previously, we would segfault if no path is specified (case 1 below). We would also ignore any host and scheme portion of the URL (which is how we specify it on daedalus), so restore that capability. The query strings will still not be escaped (standards cops can determine if this is correct behavior). The following directives now work as expected: RedirectMatch /jakarta1(.*) http://jakarta.apache.org$1 RedirectMatch /jakarta2(.*) http://jakarta.apache.org/dist$1 RedirectMatch /jakarta3(.*) http://jakarta.apache.org/dist$1?bar=foo RedirectMatch /jakarta4(.*) http://jakarta.apache.org/dist$1?bar=foo#spaz
Clear out this optimization till we are prepared for it (not now.)
adjust to apr_uri_ rename
Moved util_uri to apr-util/uri/apr_uri, which means adding the apr_ prefix to all of the uri functions (yuck), changing some includes, and using APR error codes instead of HTTP-specific error codes. Other notes to test this patch: - You need to delete the util_uri.h file - exports picks up on this. - I'd like to remove the apr_uri.h from httpd.h, but that might increase the complexity of this patch even further. Once this patch is accepted (in some form), then I can focus on removing apr_uri.h from httpd.h entirely. I need baby steps (heh) right now. - I imagine that this might break a bunch of stuff in Win32 or other OS builds with foreign dependency files. Any help here is appreciated. This is a start... -- justin Submitted by: Justin Erenkrantz Reviewed by: Roy Fielding
Back out the recent change to ap_get_brigade, to make it use indirection again. The problem is that the amount of data read from the network, is not necessarily the amount of data returned from the filters. It is possible for input filters to add bytes to the data read from the network. To fix the original bug, I just removed the line from ap_get_client_block that decremented r->remaining, we allow the http_filter to do that for us. I have also removed an incorrect comment.
*) Introduce "ap_conf_vector_t" type to assist with legibility and provide some type safety. (unfortunately, our old "void*" is type-safe with the new one, but over time we should be better) *) Propagate the new type to all appropriate functions. *) Random cleaning, whitespace, stylistic nits.
Update copyright to 2001
Clean up some of the includes: - explicitly include apr_lib.h since ap_config.h doesn't - use apr_want.h where possible - use APR_HAVE_ where possible - remove some unneeded includes
renaming various functions for consistency sake see: http://apr.apache.org/~dougm/apr_rename.pl PR: Obtained from: Submitted by: Reviewed by:
Fix a bug with AliasMatch. When forward fitting a bug from 1.3 to 2.0, we forgot a single line which broke this option. PR: 6881
The big change. This is part 3 of the apr-util symbols rename, please see the first commit of srclib/apr-util/include (cvs apr-util/include) for the quick glance at symbols changed.
Provide apr_pool_t arg to register_hooks, since anything they do in that step -must- be done with a pool that will not outlive the cmd pool, from which they may have been dynamically loaded.
Make handlers use hooks.
Newer canonicalization code should replace this patch entirely, however it's nice to have a working server as a starting point :-)
Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbols for CORE_EXPORT to AP_CORE_DECLARE (namespace protecting the wrapper) and retitled API_EXPORT as AP_DECLARE and APR_EXPORT as APR_DECLARE. All _VAR_ flavors changes to _DATA to be absolutely clear. Thank you Greg, for the most obvious suggestion.
Remaining cleanup of ap_ -> apr_ and AP_ -> APR_ transformation... see src/lib/apr/apr_compat.h for most details. Also a few minor nits to get Win32 to build. PR: Obtained from: Submitted by: Reviewed by:
prefix libapr functions and types with apr_
Move all APR functions related to strings to their own directory, and create a new header for those functions. This is the first step to removing the apr/lib directory completely, and moving those files/functions to descriptive directories.
Include strings.h for strcasecmp(), strncasecmp(), and bzero(). Include time.h for time(). This removes a bunch of compiler warnings with gcc -Wall on AIX. Submitted by: Jeff Trawick, Victor Orlikowski
Fix warnings.
Use the new command-handler initializer macros in some more modules. Unfortunately, the resulting warnings are *not* all cleaned up. Ten or so warnings spill over to non-AP_DEBUG builds (but that just means that there is a bigger pool of folks to resolve them, right?).
PR: Obtained from: Submitted by: Reviewed by: Reverse out all _EXPORT_VAR changes back to their original _VAR_EXPORT names for linkage (API_, CORE_, and MODULE_).
This patch corrects the issues from the AP_EXPORT and linkage
specification arguments to the ap_hooks.h declarations. As with
the APR_ and AP_ patches, API_VAR_EXPORT becomes API_EXPORT_VAR,
and MODULE_VAR_EXPORT becomes MODULE_EXPORT_VAR.
I will be happy to revert the inclusion of ap_config.h from
httpd.h if this bothers anyone. More individual modules need
to be patched if we do so.
The API_EXPORTs all moved into central storage in the ap_config.h
header. Without WIN32 or API_STATIC compile time declarations,
these macros remain no-ops.
This patch also moves the following data from http_main to http_config:
const char *ap_server_argv0;
const char *ap_server_root;
ap_array_header_t *ap_server_pre_read_config;
ap_array_header_t *ap_server_post_read_config;
ap_array_header_t *ap_server_config_defines;
And the following variables had already moved into ap_hooks.c:
ap_pool_t *g_pHookPool; (initialized now in http_config)
int g_bDebugHooks; (out of http_config)
const char *g_szCurrentHookName; (out of http_config)
The changes to http_main.c are in preparation for that module to
move out to a seperate .exe for win32. Other platforms will be
unaffected, outside of these changes.
add AP_ prefix to *HOOK* macros
Change ap_context_t to ap_pool_t. This compiles, runs, and serves pages on Linux, but probably breaks somewhere.
Update to Apache Software License version 1.1
Fix all the License issues. Including: s/Apache Group/Apache Software Foundation/ s/1999/2000/ s/Sascha's license/ASF license
Include ap_config.h before httpd.h, this ensures that AP_USE_HSREGEX is defined correctly in all C files.
Fix compile breaks on Windows.
Changed pools to contexts. Tested with prefork and pthread mpm's. I'll check this out tomorrow and make sure everything was checked in correctly.
Start to implement module-defined hooks that are a) fast and b) typesafe. Replace pre_connection module call with a register_hook call and implement pre_connection as a hook. The intent is that these hooks will be extended to allow Apache to be multi-protocol, and also to allow the calling order to be specified on a per-hook/per-module basis. [Ben Laurie] Port a bunch of modules to the new module structure. ["Michael H. Voase" <mvoase@midcoast.com.au>] Submitted by: Ben Laurie
Apache 1.3.9 baseline for the Apache 2.0 repository. Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9 Submitted by: Apache Group
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.
| apache@apache.org | ViewVC Help |
| Powered by ViewVC 1.1.2 |