mod_cache_socache: Don't clean up too soon. If we do, revalidated requests
lose their bodies.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1418648 13f79535-47bb-0310-9956-ffa450edef68

Add some __attribute__ for automatic format checking.
Correct one catch in sed0.c.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1418556 13f79535-47bb-0310-9956-ffa450edef68

Use ap_rputs instead of ap_rvputs where applicable.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1418524 13f79535-47bb-0310-9956-ffa450edef68

API sync... not crucial for trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1418049 13f79535-47bb-0310-9956-ffa450edef68

fixed types since MSVC doesnt have uint*_t.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1417585 13f79535-47bb-0310-9956-ffa450edef68

Userland change

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1417546 13f79535-47bb-0310-9956-ffa450edef68

Add useful mod_status info... try to determine last time
a specific vhost was accessed/used.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1417529 13f79535-47bb-0310-9956-ffa450edef68

save a apr_time_now() call for every request.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1417440 13f79535-47bb-0310-9956-ffa450edef68

cppCheck: kill a unread variable warning

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1417197 13f79535-47bb-0310-9956-ffa450edef68

Fixed type mismatch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1416889 13f79535-47bb-0310-9956-ffa450edef68

* modules/ssl/ssl_engine_io.c (ssl_io_filter_error): Use the correct
  response status in the 502 error bucket; fortuitously this error
  bucket is currently ignored so this bug was not user-visible.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1416589 13f79535-47bb-0310-9956-ffa450edef68

Avoid processing some files twice if APR_INCLUDEDIR and
APU_INCLUDEDIR containin the same path but differing in
doubled slashes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1416278 13f79535-47bb-0310-9956-ffa450edef68

Sort error message for ServerTokens by increasing verbosity. Add missing 'OS'
variant.

Remove some trailing whitespace.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1416150 13f79535-47bb-0310-9956-ffa450edef68

error[120] is already defined in this function. Just use it instead of shadowing.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1416121 13f79535-47bb-0310-9956-ffa450edef68

Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1416001 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415965 13f79535-47bb-0310-9956-ffa450edef68

axe warnings about MSIE 5 and other dead browsers

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415960 13f79535-47bb-0310-9956-ffa450edef68

Fix peek

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415753 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415550 13f79535-47bb-0310-9956-ffa450edef68

analogous to r1415075

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415549 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415077 13f79535-47bb-0310-9956-ffa450edef68

than -> then

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415075 13f79535-47bb-0310-9956-ffa450edef68

add PR's in for recent commits

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415024 13f79535-47bb-0310-9956-ffa450edef68

PR54223: 2.4 generates AH00554 when Include points to a directory with no wildcard.

r931435 refactored ap_process_resource_config() so it didn't read through
directories, but also changed a path non-fnmatch directories are passed
through to call ap_process_resource_config().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415023 13f79535-47bb-0310-9956-ffa450edef68

PR54222: catch invalid ServerTokens args

Submitted by: Jackie Zhang  <jackie.qq.zhang gmail.com>
Reviewed/modified by: covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415008 13f79535-47bb-0310-9956-ffa450edef68

Zombie translations

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1414412 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1414104 13f79535-47bb-0310-9956-ffa450edef68

as reported by comments

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1414094 13f79535-47bb-0310-9956-ffa450edef68

CVE-2012-3499 and CVE-2012-4558

Be sure to escape potential troubled strings

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1413732 13f79535-47bb-0310-9956-ffa450edef68

mod_dumpio: Correctly log large messages + style issues
PR 54179

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1412278 13f79535-47bb-0310-9956-ffa450edef68

Sometimes we miss the last few items in the Q due
to time fuzzyness. Force the full Q by adding an extra
2sec fudge factor

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1412086 13f79535-47bb-0310-9956-ffa450edef68

Use apr_is_empty_table() instead of getting a table and checking the value of the 'nelts' field.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411862 13f79535-47bb-0310-9956-ffa450edef68

Bug from not using pools by default :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411715 13f79535-47bb-0310-9956-ffa450edef68

Force even malloc'ed mem to be 0ed. And pull out wasted cycles that
did the nulling.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411424 13f79535-47bb-0310-9956-ffa450edef68

Some formatting and a bugfix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411415 13f79535-47bb-0310-9956-ffa450edef68

The compiler *should* do this, but just in case

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411361 13f79535-47bb-0310-9956-ffa450edef68

skiplist_destroy() is new-ish

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411279 13f79535-47bb-0310-9956-ffa450edef68

Remove from API

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411274 13f79535-47bb-0310-9956-ffa450edef68

Merge branch 'skiplist'

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411190 13f79535-47bb-0310-9956-ffa450edef68

s/;;/;/

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410971 13f79535-47bb-0310-9956-ffa450edef68

add attribute nonnull to a few functions

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410963 13f79535-47bb-0310-9956-ffa450edef68

Be nice and ignore some KDevelopment4 files

PR: 54135

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410958 13f79535-47bb-0310-9956-ffa450edef68

Copy svn:ignore from server/mpm/event

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410956 13f79535-47bb-0310-9956-ffa450edef68

Don't log a spurious "-" if a request has been rejected
before mod_log_forensic could attach its id to it.

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=693292

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410954 13f79535-47bb-0310-9956-ffa450edef68

Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410887 13f79535-47bb-0310-9956-ffa450edef68

Document the check in open_logs()

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410885 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410757 13f79535-47bb-0310-9956-ffa450edef68

Fix cut'n'paste error

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410756 13f79535-47bb-0310-9956-ffa450edef68

Add SERVER_PROTOCOL_VERSION, SERVER_PROTOCOL_VERSION_MAJOR,
SERVER_PROTOCOL_VERSION_MINOR ap_expr variables.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410755 13f79535-47bb-0310-9956-ffa450edef68

xform

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410682 13f79535-47bb-0310-9956-ffa450edef68

PR53963: don't merge the rewritebase down w/o an opt-in

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410681 13f79535-47bb-0310-9956-ffa450edef68

fdq expects a certain behavior from atomics... ensure that
the event mpms check this.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410459 13f79535-47bb-0310-9956-ffa450edef68

Fold in a missing optimization...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410328 13f79535-47bb-0310-9956-ffa450edef68

missed one

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410004 13f79535-47bb-0310-9956-ffa450edef68

Update and sync

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1409909 13f79535-47bb-0310-9956-ffa450edef68

Prefer higher-mode polling, but allow for drop down to default

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1409878 13f79535-47bb-0310-9956-ffa450edef68

* support/rotatelogs.c: Cleanups, no functional change.  Drop revision
  history, "svn log" works; use APR_PATH_MAX; constify more.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1409800 13f79535-47bb-0310-9956-ffa450edef68

* support/rotatelogs.c (post_rotate): Really omit the second arg when
  invoking a post-rotate program, rather than passing an empty arg.
  (Fixes to code match desired&documented behaviour.)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1409726 13f79535-47bb-0310-9956-ffa450edef68

Give the opportunity to the compiler to compute at compile time the strlen of the given
string. Most of the calls to ap_fputs are done with constant strings.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1409437 13f79535-47bb-0310-9956-ffa450edef68

required by eventopt

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1409295 13f79535-47bb-0310-9956-ffa450edef68

no longer needed

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1409273 13f79535-47bb-0310-9956-ffa450edef68

Pull out the "extended" pod functions used by event and worker
to core, since it will be used by Simple and Lean and
likely other MPMs. Avoid duplication.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1409214 13f79535-47bb-0310-9956-ffa450edef68

Axed C++ comments.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1409170 13f79535-47bb-0310-9956-ffa450edef68

formatting: space vs tab

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1408961 13f79535-47bb-0310-9956-ffa450edef68

mod_session_dbd: fix a segmentation fault in the function dbd_remove.
The segmentation fault is caused by an uninitialized function pointer session_dbd_acquire_fn.
PR 53452

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1408958 13f79535-47bb-0310-9956-ffa450edef68

followup to r1348036, MSSDK's WinLdap.h uses an enum for LDAP_* status codes, so the block is not included

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1408402 13f79535-47bb-0310-9956-ffa450edef68

ignore auto-generated docs/log-message-tags/list

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1408097 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1408094 13f79535-47bb-0310-9956-ffa450edef68

Remove SSLv2 stuff that is no longer supported. Add a few newer algorithms
and cipher aliases. This is incomplete, but the openssl 1.0.1c man pages
don't have the complete list either :-(

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1408093 13f79535-47bb-0310-9956-ffa450edef68

Replace an incorrect #if by the correct corresponding #if defined(...)

PR 54133 reported by Teodor Milkov ()

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407965 13f79535-47bb-0310-9956-ffa450edef68

cppCheck:  Suspicious condition.

AFAIK, there is no actual problem with the existing code.  'rv' would only not have the 'expected' value, but the execution
path would remain the same.
However, the patched code is more logical. We put the returned value in 'rv', then test it against 0.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407853 13f79535-47bb-0310-9956-ffa450edef68

Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407824 13f79535-47bb-0310-9956-ffa450edef68

Make HttpProtocol accept a range of allowed versions.
Bump MMN

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407643 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407601 13f79535-47bb-0310-9956-ffa450edef68

Expose ap_method_register() to the admin with a new RegisterHttpMethod
directive.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407599 13f79535-47bb-0310-9956-ffa450edef68

Pull the event optimization MPM back into trunk. This
provides more eyes and allows work to continue on
it...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407533 13f79535-47bb-0310-9956-ffa450edef68

remove obsolete comment from 1.3 days

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407528 13f79535-47bb-0310-9956-ffa450edef68

fix comment typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407526 13f79535-47bb-0310-9956-ffa450edef68

Remove warnings
mod_speling.c:400:41: warning: data argument not used by format string [-Wformat-extra-args]
                          r->uri, nuri, ref);
                                                                                                                        mod_speling.c:508:53: warning: data argument not used by format string [-Wformat-extra-args]
                          r->uri, candidates->nelts, ref);

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407460 13f79535-47bb-0310-9956-ffa450edef68

remove warning:
mod_remoteip.c:404:38: warning: data argument not used by format string [-Wformat-extra-args]
It's a hack, but maintain the orig hack ;)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407459 13f79535-47bb-0310-9956-ffa450edef68

fix a comment to match the r1299718/r1370225 changes...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407385 13f79535-47bb-0310-9956-ffa450edef68

The following now respects DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR:

- mod_cache: thundering herd lock directory

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407381 13f79535-47bb-0310-9956-ffa450edef68

  *) mod_xml2enc: Fix problems with charset conversion altering the
     Content-Length. [Micha Lenk <micha lenk info>]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407248 13f79535-47bb-0310-9956-ffa450edef68

remove some more old unused code

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407088 13f79535-47bb-0310-9956-ffa450edef68

better logging for re-use/use of shm

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407085 13f79535-47bb-0310-9956-ffa450edef68

Added mod_allowhandlers to NetWare build.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407031 13f79535-47bb-0310-9956-ffa450edef68

log client error at level debug, log broken Host header value

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407006 13f79535-47bb-0310-9956-ffa450edef68

Remove unused code. "Next week" hasn't happened in the last 10 years or so.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407004 13f79535-47bb-0310-9956-ffa450edef68

s/Options/AllowOverride/ in comment describing the syntax of
AllowOverride.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406905 13f79535-47bb-0310-9956-ffa450edef68

* Ensure that nkey is initialized.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406760 13f79535-47bb-0310-9956-ffa450edef68

New directive HttpProtocol which allows to disable HTTP/0.9 support.

The syntax is designed to allow addition of a +/- strict option
later on.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406719 13f79535-47bb-0310-9956-ffa450edef68

make docs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406656 13f79535-47bb-0310-9956-ffa450edef68

user-defined needs the hyphen

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406646 13f79535-47bb-0310-9956-ffa450edef68

update xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406630 13f79535-47bb-0310-9956-ffa450edef68

mod_allowhandlers: New module to forbid specific handlers for specific
directories.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406617 13f79535-47bb-0310-9956-ffa450edef68

comment spelling fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406616 13f79535-47bb-0310-9956-ffa450edef68

Make ap_check_cmd_context() treat <If> sections like <File> sections.
This is necessary to properly disallow directives that don't work in
<If>.

A separate NOT_IN_IF flag may be nicer, but would create much more
hassle when being backported to 2.4.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406495 13f79535-47bb-0310-9956-ffa450edef68

Make <If> sections in virtual host context fill in cmd->path so that
other directive notice that they are in a config section.

This fixes LogLevel not working in <If> sections that are not in
Location/Directory/File sections.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406493 13f79535-47bb-0310-9956-ffa450edef68

try to catch up if docs/log-message-tags/next-number is out of date

doing two passes would be even better, will look at that later

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406069 13f79535-47bb-0310-9956-ffa450edef68

Replace duplicate log tags

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406068 13f79535-47bb-0310-9956-ffa450edef68