Silent some cppcheck warnings.

Fix missing spaces in messages

Remove useless tests. Turn if (*x && apr_isspace(*x)) into if (apr_isspace(*x))

ccpcheck: duplicateExpression - 'vary_by_language' is tested twice

SECURITY: CVE-2012-2687 (cve.mitre.org): mod_negotiation: Escape filenames in variant list to prevent an possible XSS for a site where untrusted users can upload files to a location with MultiViews enabled. * modules/mappers/mod_negotiation.c (make_variant_list): Escape filenames in variant list. Submitted by: Niels Heinen <heinenn google.com>

Add lots of unique tags to error log messages

Remove unused variable.

Use ap_pass_brigade_fchk()

mod_negotiation: don't return non-AP_FILTER_ERROR filter return values to ap_run_handler() when sending a body directly from a type-map.

refactor to pull setting of Accept-Ranges header into http_protocol.c which had been copied to other handlers.

Fix parsing of Content-Length in type maps PR: 42203 Submitted by: Nagae Hidetake <nagae eagan jp>

fix some dead assignments found by the clang analyzer

Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take advantage of per-module loglevels

mod_negotiation: Preserve query string over multiviews negotiation. PR 33112 Joergen Thomsen

* Escape pathes of filenames in 406 responses to avoid HTML injections and HTTP response splitting. PR: 46837 Submitted by: Geoff Keating <geoffk apple.com> Reviewed by: rpluem

Disabled DefaultType directive and removed ap_default_type() from core. We now exclude Content-Type from responses for which a media type has not been configured via mime.types, AddType, ForceType, or some other mechanism. MMN major bump to NZ time. PR: 13986

more tab cleanups

Sub-requests are created and used with two purposes; sometimes simply to 'see' what a request would do; as to fill out an SSI, validate access or similar - and is then discarded. And sometimes as the precursor to becoming the actual request; e.g. when mod_dir checks if an /index.html can be served for a '/'. In the latter case it is important to preserve the output filters 'for real'; whereas in the first case they have to be reset to purely the minimal proto filters (if at all). This patch instates the output filters in 3 cases where sub-requests are/may in fact be used as the real request later on. This is a relatively risky change (which should not be back-ported without further discussion) and may break caches in combination with internal redirects/vary/negotiation in subtle ways. See the thread starting at [1] and in particular the general concerns of rpluem at [2] with respect to sub requests and (fast_)internal redirects possibly needing a more thorough overhaul. 1: http://mail-archives.apache.org/mod_mbox/httpd-dev/200802.mbox/ajax/%3c335D1A4B-25E2-4FF1-8CDF-5010A7FBD293@webweaving.org%3e 2: http://mail-archives.apache.org/mod_mbox/httpd-dev/200802.mbox/%3c47ACE1D4.4060702@apache.org%3e

mod_negotiation: preserve Query String in resolving a type map PR 33112. Report with patch by Jørgen Thomsen. Attention called to it by Per Jessen.

update license header text

* server/core.c (default_handler): Use apr_brigade_insert_file() to append the file to the brigade. * server/protocol.c (ap_send_fd), modules/proxy/mod_proxy_http.c (spool_reqbody_cl), modules/cache/mod_mem_cache.c (recall_body), modules/cache/mod_disk_cache.c (recall_body), modules/mappers/mod_negotiation.c (handle_map_file), modules/generators/mod_asis.c (asis_handler), modules/dav/fs/repos.c [DEBUG_GET_HANDLER] (dav_fs_deliver), modules/arch/win32/mod_isapi.c (ServerSupportFunction): Likewise.

Update the copyright year in all .c, .h and .xml files

* Minor performance tweak by reusing already calculated strlen in get_body. Submitted by: Christophe Jaillet <christophe.jaillet wanadoo.fr> Reviewed by: Ruediger Pluem

No functional Change: Removing trailing whitespace. This also means that "blank" lines consisting of just spaces or tabs are now really blank lines

Check an alternative return value for when a file or directory does not exist. Previously this would return a forbidden on the documentation website for any URL ending in .html.

Update copyright year to 2005 and standardize on current copyright owner line.

parse content-length correctly using apr_strtoff function

save some cycles

don't return forbidden, if the file was just not found.

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.

switch to APR 1.0 API (which is still in flux) because of the changes to the argument lists of apr_mmap_dup and apr_socket_create, 2.1-dev won't build with apr and apr-util's 0.9 branch anymore

make sure, the preferred language gets its chance, even when it's not listed in browser's accept-language list.

mod_negotiation: quality values are now parsed independent from the current locale. level values are now really parsed as integers. PR: 17564 Reviewed by: Dirk-Willem van Gulik

Extend mod_negotiation to evaluate the environment variables no-gzip and gzip-only-text/html the same way as mod_deflate does. (it drops all non-identity encodings, not only gzip)

fix style and WS issues. No code changes.

finished that boring job: update license to 2003. Happy New Year! ;-))

Introduce "prefer-language" environment variable, which allows to influence the negotiation process on request basis to prefer a certain language, e.g.: SetEnvIf Request_URI ^/manual/foo/ prefer-language=foo

Set the appropriate mime response headers for negotated type-map Body: responses. wrowe's review; My earlier concern doesn't apply. Type maps have always required the author to be explicit in all header fields to be negotiated; if the headers aren't given in the type map file the resulting redirect (for non-body maps) is broken anyways. As to my other concern, the charset should only exist if the Content-Type was given. Submitted by: Andr� Malo <nd@perlig.de>

use memcpy() instead of strncpy() since strncpy() is more expensive but none of its extra function is needed

don't lose const looking for that '/'

Security rollup for 2.0.40 release. Tag and roll baby.

catch up with the apr_atoll -> apr_atoi64 rename

Replace atol() calls which should return long long with apr_atoll() calls. Submitted by: Shantonu Sen <ssen@apple.com>

Continue the Bill Rowe apr_size_t crusade.

stop using APLOG_NOERRNO in calls to ap_log_[pr]error()

BUCKET FREELISTS Add an allocator-passing mechanism throughout the bucket brigades API. From Apache's standpoint, the apr_bucket_alloc_t* used throughout a given connection is stored in the conn_rec by the create_connection hook. That means it's the MPM's job to optimize recycling of apr_bucket_alloc_t's -- the MPM must ensure that no two threads can ever use the same one at the same time, for instance.

Commit 1 of 2 to: 1. rename ap_rset_content_type to ap_set_content_type 2. reverse the arguments on the call to aligh with ap_set_content_length

First commit to introduce accessor function to set r->content_type..

Update our copyright for this year.

Resolve the issue Jeff pointed out in his recently added comment. That is, prevent a possible segfault or finding a tag in reused memory.

add a comment to point out a potential segfault tweak an existing comment to make it a little more clear

Address the issue raised on list that users with a LanguagePriority directive alone expect 'ForceLanguagePriority Prefer' behavior even if that directive is omitted.

Many of our platform's apr_dir_read() aren't returning APR_FINFO_TYPE, so we will take the long way through (and the long way for LNK's as well.)

backing out fix for missing path info and query string. wrowe beat me to it.

handle_multi: pass along the original path info and query string if we redirect due to negotiation pointed out by: Bill Rowe also, clarify what some code in handle_map_file is doing

Shortcut where the resource has no language [discovered with no DefaultLanguage in cgi-bin, resolving Greg Ames' observations, we had a lurking segfault.] This begs the question, what exactly did the fn do with no language in terms of serving content back in 1.3. Should be reviewed.

Which PR? I can't count them all. Get QUERY_STRING and PATH_INFO working again. Also rounds out our fix to work around negotiated directories which Greg Ames fixed; this addition in request.c simply shortcuts all further processing.

Need a null language_priority array for an either/or choice in the conf merge. This does so. The merges should be significantly quicker.

Thanks Mr. Trawick, backtraces can be very enlightening. This fixes two bugs, the segfault when researching index numbers, and another. We don't hint anywhere that LanguagePriority is a cumulative setting, in fact the syntax doesn't suggest so either. Merges are always slow, there is no reason to make this even slower. So the patch has the LanguagePriority directive override any existing LanguagePriority list from an earlier container.

get rid of an unused variable

Introduce the ForceLanguagePriority options; Prefer will circumvent a Multiple Choices by electing the first matching language from the LanaguagePriority list. Fallback will circumvent a None Acceptable by electing the first language found from the LanaguagePriority list. This breaks [expectedly] the negotiation tests. They need review. My test results will be posted to dev.

Modified for clarity.

rename variable "except" to avoid colliding with a macro of the same name on Tru64

Fix a mismatching issue, where index.html.foo.en had recognized .html and .en components, and exceptions index and foo. This patch will ignore the 'missing' exception html from the request, and go on to test the exception foo in the list. This does -not- imply that a request for index.foo will succeed, in the example above. The pattern match tests index.foo[.*] so we wouldn't find index.html.foo.anything. The pattern matching proposed at one time by Francis Daly would allow index.foo to succeed as well [although many to many matching is dangerous, see comments in this patch.]

This patch eliminates the wasteful run-time conversion of method names from strings to numbers in places where the methods are known at compile time. (Justin fixed the va_end() call to be correct.) Submitted by: Brian Pane <bpane@pacbell.net> Reviewed by: Justin Erenkrantz

After committing Brian Havard's fix to Unix file_io yesterday, we seem to be reading/seeking .var files fine on Unix even with buffering turned on. wrowe reports that they're working on Win32 also.

This small patch I committed last week broke the transparent negotiation behavior. I hope this is now settled.

Eliminate proxy: (and all other 'special') processing from the ap_directory_walk() phase. Modules that want to use special walk logic should refer to the mod_proxy map_to_location example, with it's proxy_walk and proxysection implementation. This makes either directory_walk flavor much more legible, since that phase only runs against real <Directory > blocks. On a technical note, this patch also forces the Directory to be canonical (unless it is "/" or a regex.) It also allows us to be more explicit when declaring <Directory > block errors.

APR returns APR_EOF, not EOF...

temporarily back out the buffering of .var files while folks have a chance to get APR ungetc working properly on buffered files

protect const-ness of variant->file_name by using ap_strchr_c() instead of strchr()

Add the config of the ForceLanguagePriority directive, since we seem to agree on what it does. My last question is where do I force this behavior without tons of extra filesystem/cpu consumption?

buffer .var maps to avoid asking the kernel for one byte at a time note that a system trace of .var map processing still shows an extra read() after we hit EOF the first time; we could make use of the EOF flag in APR to avoid the read() or play with mod_negotiation Suggested by: Marc Slemko

please no // in Apache code... it doesn't compile everywhere a note about why it is commented out would be appropriate too

This is the Body:tag\n<Content>*tag\n patch for type map files. If the content can be served, it sends a file bucket of the type map file itself, forward spaced to the <Content>, set to the length of <Content>. <Content> may contain any binary data. The end tag must exist, anything between the tag and \n is ignored. This version (v.s. the patch sent to the list) includes error reporting if the end tag cannot be located. We need to change the etag code to accept an additional argument, so we can set the cache controls properly.

A debatable change, to return (an absolute) 404 if some of the extentions of every matching file isn't decodable by mod_mime, instead of 500. Adopted 404 as the result, per Roy Fielding.

Change the error wording, slightly.

Thanks goes to Manoj, while commenting on another issue, for triggering this idea. If we find files matching (e.g. index.html.bak matches index.html) but they are rejected because we don't understand them (e.g. they are a directory, or .bak isn't a mod_mime recognized extension) then Error 500 out of here, with a note for the system administrator explaining that index.html matches some files, but their extensions cannot be grokked. No more (unintentional, or situational) autoindex :)

Remove the ->mtime reset back to negotiation, who decided to do this.

Fix typo from extracting the fast-redirect code

The real slim shady finally stood up. This patch segregates the fast internal redirect logic back into http_request, the next patch will actually fix it.

minimal changes to get it to compile

Subtle variation for security. If the mod_mime file has nothing specific to say about a given set of file extentions (and has only based the resolved fields on the default language, encoding and content type) then tell us we can ignore the result by leaving the exception list entirely undefined. If mod_mime adds anything (a language, charset, or whatnot) then proceed to use the file in the Multiviews evaluation, otherwise mod_negotation will ignore the file found. This points out a need for a slightly twisted DefaultClientLanguage, as opposed to creating foo.html.html files. Either that, or introduce a 'neutral' entity that the user can list (say, .default) for mod_mime to declare it as a fallback language/encoding/content-type/handler.

Solve the major underlying problem of content negotation by passing mod_negotiation the 'unresolved' parts of the path in a ->notes array ap-mime-exceptions-list. If mod_mime is given index.html.bad.en it will add index and bad to the list (presuming html and en are both defined.) mod_negotiation will decide if index and bad are it's fault (the user requested index.html.bad[.*]) or if it's a messed up file (say .old, .junk, or .bak). The next patch to allow any-order negotiation should check each of these list elements, so that asking for index.bad in the prior example would succeed. Right now that request would fail because .html was recognized, so it's not in the exceptions list. This patch uses a simple strcmp to the given name. Also, this patch allows any mod_mime processed file to be served, even if the content type cannot be determined (think README.en). This is crippled by the client expect headers and omitting the default content type. PLEASE vet this code carefully.

Minor quibble, <li> can and should be a balanced tag

Final pedantic HTML 3.2/4.01 Transitional + XHTML 1.0 Transitional compliance changes. Note I've left alone the <P> tags, since they are abused, misused, potentially unsalvageable and certainly more effort than I care to expend in my quest for brainless end of week keyboard exercise.

Change the length of the content args to apr_off_t identifiers, and fix mod_negotation to treat a size of -1 and indeterminate, instead of 0.

Deploy ap_sub_req_lookup_dirent() for the main loop. Note we _really_ need to further optimize this code, there are dozens of perhaps unnecessary stat calls, and meaningless #ifndef OS2 protections around apr_lstat()'s. OS2 has lstat (It's simply stat()) so we should pull the os-specific cruft.

Allow index.html.en and Index.html.FR to both be considered in negotation on case insensitive platforms, only.

Toss the float nonsense from c-l, and cast atof as a (float), which I will argue is a totally appropriate use of a cast :-)

*) 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:

Eliminate all assumptions that finfo.protection reflects the existance or absense of a file. finfo.filetype is defined as 0 if APR_NOFILE, or a non-zero value if the file could be apr_stat()'ed.

Use the appropriate APR_FINFO_flags for the apr_stat/lstat/getfileinfo calls to avoid ownership and permissions on Win32 when they are not required, and until they are implemented.

Accomodate the change to the apr_read_dir() arguments, and change all apr_dirfoo() and apr_foodir() commands to apr_dir_foo() to match the earlier-renamed apr_dir_open().

The changes required for the APR_FINFO_wanted argument to apr_stat/lstat/getfileinfo. These are -NOT- optimal, they are simply the required changes to get the server working. The size of the patch is a warning about how we need to really look at what we are trying to accomplish with all of these stat/lstat calls.

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.

adjust remaining modules to use the new handler hook method (Alan Edwards) bring back the old handler prototype by reusing r->handler (dougm) PR: Obtained from: Submitted by: Reviewed by:

Make handlers use hooks.

Stop copying file names that we get from apr_file_t's and apr_dir_t's. We copy the data when we store it in the structures, we can just return a pointer from there, and use const data. This puts the onus back on Apache to copy the data if it needs to modify it.

Rename the apr_opendir symbol to apr_dir_open. This makes more sense, and the rename was proposed a while ago inside of APR.

Clean up some compiler warnings (there remain some float=double and long=double warnings that didn't offer a simple answer at this moment.)

*) Compensate for recent changes in the APR headers. Specifically, some files need to specifically include stdio.h, or a particular apr_*.h header. *) Adjust callers of apr_create_process() to deal with the extra "const" *) Add "const" to args of ap_os_create_privileged_process()

Allow modules to specify the first module for a sub-request. This allows modules to not have to muck with the output_filter after it creates the sub-request. Without this change, modules that create a sub-request have to manually edit the output_filters, and therefore skip the sub-request output_filter. If they skip the sub-request output_filter, then we end up sending multiple EOS buckets to the core_output_filter.

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_

- fix POOL_DEBUG ... restored the ap_pool_joins that dreid removed. - removed the apr_abort foo since every caller was passing it NULL anyway; and this is debugging code, so i don't have any qualms about using stderr or abort().

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

blast the old names for the status codes

Fix warning.

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?).

ap_pool_join is a debugging function so remove it.

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.

Make the server work without asking for buffered file I/O. This removes all APR_BUFFERED flags from the server, and it fixes a minor bug in the ungetchar patch (I forgot a file when comitting).

Get mod_negotiation working. We may ultimately need finer granularity of type_checker hook ordering, but this will get MultiViews working for now.

Update to Apache Software License version 1.1

Explain the changed syntax of CacheNegotiatedDocs

+1000 on dirk's change... and add a TODOC: which is the token i used when doing the initial mpm stuff to indicate required documentation changes.

Take my chance and try to sneak in a very nasty change which will break some backward compatibility but get rid of half a dozen nasty if-then special cases in any config file parser or gui. I am _NOT_ going to be offended if anyone rolls this patch back; or hack's it with a RAW_ARG as to also take the old config as well. PR: Obtained from: Submitted by: Reviewed by:

Fix all the License issues. Including: s/Apache Group/Apache Software Foundation/ s/1999/2000/ s/Sascha's license/ASF license

Manoj has been pushing for this for a while, but I've been too dense to understand that he was right. :-) Basically, this makes the modules use ap_config to test for header file inclusion. This method is not to be used for larger modules that run autoconf theirselves. Including ap_config is only valid for modules which rely on Apache to do their configuration. Currently, this is only the core modules.

This is a huge change to the configure system. Basically, this name space protects most, if not all, of the Apache macros. This has been tested on Linux using all of the Unix MPM's. The biggest push was that Apache's httpd.h header file can no longer include the ap_config.h file. Most of the other files include this themselves now. Submitted by: Ryan Bloom and Manoj Kasichainula

Rework ap_finfo_t to split the file type out of the protection field. I've taken a stab at the unix implementation but tested only on OS/2.

Separate the stat structure from the file structure and use ap_stat and ap_getfileinfo in apache.

Initialize all ap_file_t's to NULL. This allows ap_open and ap_stat to work together without causing memory leaks.

First step in getting Apache to use APR's time libraries. This gets a good number of them, but I think there are more time values still in the Apache code. This works under Linux, but has not been tested anywhere else.

Finish the conversion from fprintf(stderr -> ap_log_err.

Add a status value to ap_log_error and ap_log_rerror. This allows us to use apr_status codes in our error logs. The main advantage of this, is portable error codes. Now, Windows will finally be able to use errno!

I missed one function when swapping paramters. This fixes it. I think I have caught them all this time. I really hope this is the final time I have to swap parameters.

Remove most of the annoying "re ap_context_t mplement" mis-replacements by what I think is their real meaning. Guys, I didn't verify all of this, please have a close look at my "fixes". Thanks.

Bring file_io up to the new parameter order for APR. I have decided to do these on a directory by directory basis for the rest of APR. I hope to cause fewer problems for other developers by doing it this way.

Simple name change. the function ap_gets has been renamed to ap_fgets. This is more in-line with what the function does, and how it acts, so it makes sense.

First patch to re-order function parameters. This one gets the low hanging fruit, and moves most of the result parameters to the first argument. Future patches in this series will move the rest of the result parameters to the beginning of the list, and will move the context's to the end of the list

Use return status instead of character value for EOF.

Remove all of the calls to functions like "ap_popenf". These functions were moved down to APR, but they are being removed. They are not portable, and were only moved down for backwards compatability. With this change, they can be safely removed, which is the next commit on it's way. Submitted by: Ryan Bloom and Paul Reder

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