ab: add the possibility to define a socket timeout (-s timeout)
[Guido Serra <zeph fsfe org>]

Also some changes In usage():
- reword -t option to be more clear with the new -s
- add missing -q
- add the new -s option
- reword some options to better match online documentation

ab.xml claimed that -s was already there, but nothing in the code looks like that.
So, I guess it only landed on the online doc...
Submitted by: jailletc36
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1430300 13f79535-47bb-0310-9956-ffa450edef68

httxt2dbm: Correct length computation for the 'value' stored in the DBM file  PR 47650
Submitted by: jailletc36
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1430298 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1427428 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.


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.

Submitted by: sf
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1422877 13f79535-47bb-0310-9956-ffa450edef68

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1422871 13f79535-47bb-0310-9956-ffa450edef68

without adding the name to the Vary header.

Submitted by: sf
Backported by: rjung
Reviewed by: rjung, jailletc36, sf

Backport of r1403483 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1422586 13f79535-47bb-0310-9956-ffa450edef68

slot allocation on a specified slot. Allow for clearing of inuse
array.

trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1386880
             http://svn.apache.org/viewvc?view=revision&revision=1387389
             http://svn.apache.org/viewvc?view=revision&revision=1388445
             http://svn.apache.org/viewvc?view=revision&revision=1394079
Submitted by: jim
Reviewed by: rjung, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1422580 13f79535-47bb-0310-9956-ffa450edef68

PR 40841.

trunk patch: http://svn.apache.org/viewvc?rev=1404625&view=rev
             http://svn.apache.org/viewvc?rev=1420223&view=rev
2.4.x patch: http://people.apache.org/~jorton/proxyftpepsv-24.patch
Submitted by: jorton
Reviewed by: jim, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1422578 13f79535-47bb-0310-9956-ffa450edef68

get_form_auth() and get_session_auth(). Makes sure that REMOTE_USER
does not vanish during mod_include driven subrequests.

trunk patch: http://svn.apache.org/viewvc?rev=1393152&view=rev
Submitted by: minfrin
Reviewed by: minfrin, jim, gsmith



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1422570 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1421947 13f79535-47bb-0310-9956-ffa450edef68

Bring XML output up to snuff for balancer-manager

and allow the xml param
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1420135 13f79535-47bb-0310-9956-ffa450edef68

- Move many common code parts into separate source file. This adds some
  of htpasswd's recent improvements to htdbm.
- Rework salt generation to use the full 48bit of entropy for MD5
  Previously, it would only generate 2^32 different salts on a given
  platform.
- Use apr_getopt().
Submitted by: sf
Backport of r1395253 from trunk.

Add passwd_common.c build support for Windows and Netware
Submitted by: sf
Backport of r1395254 from trunk.

Add support for bcrypt (requires apr-util 1.5 or higher).
PR: 49288
Submitted by: sf
Backport of r1395255 from trunk.

Optionally read passwords from stdin as more secure alternative to -b.
PR: 40243
Submitted by: Adomas Paltanavicius <adomas paltanavicius gmail com>, sf
Backport of r1395256 from trunk.
Submitted by: Adomas Paltanavicius <adomas paltanavicius gmail com>, sf

Removed __func__ usage which is c99.
Submitted by: sf
Backport of r1395792 from trunk.

All of the above backported by: sf
All of the above reviewed by: sf, gsmith, rjung

fix unresolved external symbol __imp__UuidCreate error
Submitted by: gsmith
Backported by: gsmith
Reviewed by: gsmith, rjung
Backport of r1419084 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1420084 13f79535-47bb-0310-9956-ffa450edef68

AuthFormLoginRequiredLocation, AuthFormLoginSuccessLocation
and AuthFormLogoutLocation directives.

mod_auth_form: Make sure 500 Internal Server Error is
returned should an error occur while parsing an expression.

Submitted by: minfrin
Backported by: minfrin
Reviewed by: minfrin, sf, rjung

Backports of r1388648 and r1418721 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1420071 13f79535-47bb-0310-9956-ffa450edef68

for TLS, RFC 5054).
Including some improvements as suggested by Kaspar

PR: 51075
Submitted by: Quinn Slack <sqs cs stanford edu>, Christophe Renou,
              Peter Sylvester
Backported by: sf
Reviewed by: sf, minfrin, rjung

Backports of r1347980 and r1348653 form trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1420057 13f79535-47bb-0310-9956-ffa450edef68

   * mod_rewrite: PR53963: Ad an opt-in RewriteOption to control merging of RewriteBase
                  (This merge started happening in 2.4.0/2.2.23)

Submitted by: covener
Reviewed by: covener, minfrin, sf



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1418954 13f79535-47bb-0310-9956-ffa450edef68

various mods: host and URI escaping:

    Be sure to escape potential troubled strings

    add missing html escaping

Submitted by: jim, sf
Reviewed by: covener, minfrin, sf



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1418941 13f79535-47bb-0310-9956-ffa450edef68

    Allow for exposure of loadavg and server load via mod_headers

    Might as well show 'em all

    Document new mod_headers params: %l, %i, %b

Submitted by: jim
Reviewed by: jailletc36, druggeri, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1418937 13f79535-47bb-0310-9956-ffa450edef68

    Make ap_regcomp() return AP_REG_ESPACE if out of memory.  Make ap_pregcomp()
    abort if out of memory.
    
    This raises the minimum PCRE requirement to version 6.0, released in 2005.

Reviewed by: jim, sf, minfrin



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1418930 13f79535-47bb-0310-9956-ffa450edef68

Allow for setting of sticky session split char...
Bugz 53893

Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1417892 13f79535-47bb-0310-9956-ffa450edef68

mod_dumpio: Correctly log large messages + style issues
PR 54179 

Submitted by: Marek Wianecki
Reviewed by: jailletc36, sf, druggeri




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1416749 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/branches/2.4.x@1416747 13f79535-47bb-0310-9956-ffa450edef68

PR54222: catch invalid ServerTokens args

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



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/branches/2.4.x@1416746 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1416669 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

Submitted by: sf
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1416584 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

formatting: space vs tab

Axed C++ comments.

Submitted by: jailletc36, fuankg
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1416583 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.)

Reviewed by: jorton, jim, sf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1416406 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1409924 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

Submitted by: covener
Reviewed by: covener, trawick, igalic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1409773 13f79535-47bb-0310-9956-ffa450edef68

only write the first len chars to syslog, as the buffer may have additional
text added speculatively

Submitted by: trawick
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1408743 13f79535-47bb-0310-9956-ffa450edef68

"Iterate" directives: Report an error if no arguments are provided.

Submitted by: trawick
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1408742 13f79535-47bb-0310-9956-ffa450edef68

Change default for SSLCompression to off, as compression
causes security issues in most setups

Submitted by: sf
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1400962 13f79535-47bb-0310-9956-ffa450edef68

Allow forced setting of TLS1.1 and TLS1.2 protocols with
the -f command-line switch, and adapt the output to more accurately
report what SSL/TLS protocol was negotiated (use SSL_get_version()
instead of SSL_CIPHER_get_version()).

PR: 53916
Submitted by: Nicolás Pernas Maradei <nico emutex com>
Reviewed/amended by: Kaspar Brand

Submitted by: kbrand
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1400946 13f79535-47bb-0310-9956-ffa450edef68

core: ErrorDocument now works for requests without a Host header.

PR: 48357

Submitted by: trawick
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1394035 13f79535-47bb-0310-9956-ffa450edef68

* server/mpm/prefork/prefork.c (child_main): Don't log errors for an
  apr_pollset_add() failure if a graceful-stop has been signalled.

follow up to r1387633: use the right exit code depending on the error scenario

Submitted by: jorton, trawick
Reviewed by: trawick, minfrin, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1393382 13f79535-47bb-0310-9956-ffa450edef68

trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1386576
             http://svn.apache.org/viewvc?view=revision&revision=1386578
2.4.x patch: trunk patch works
+1: jim, druggeri, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1393199 13f79535-47bb-0310-9956-ffa450edef68

stale content because of a proxy error. PR 53539. Correction to r1361153.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1373447
2.4.x patch: trunk patch works.
+1: rjung, jim, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1393191 13f79535-47bb-0310-9956-ffa450edef68

Fix crash in packet dump code of mod_proxy_ajp when
logging with LogLevel trace7 or trace8.

PR 53730

Submitted by: rjung
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390510 13f79535-47bb-0310-9956-ffa450edef68

Revert r1371878 --  default configuration changes that drop the DNT
header from IE10.

See:
  Message-ID: <CALK=YjMGPNHBqNiad-ghzcEzxDovQgYOpjpSSyXmN=r74v43qg@mail.gmail.com>
  PR 53845



Keep this in, but commented out: also provide a little
more background/rationale. This, hopefully, satisfies both
ends of the debate: we don't "assume" that everyone who
uses this browser didn't make the specific choice, but
we allow for admins who care about DNT and want to either
  1. Make a statement
  2. Force adherence to the standard
to easily do so.
Submitted by: covener, jim
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1389261 13f79535-47bb-0310-9956-ffa450edef68

Apply the same length limit when logging Status header values
as used when logging invalid header lines.

Application of a limit on logged header data suggested by Jeff Trawick.


Catch up change log with r1376695.

Submitted by: chrisd
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1389260 13f79535-47bb-0310-9956-ffa450edef68

Avoid the overhead of creating and grabbing a uuid for
the balancer nonce if we're never going to use it.
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1388549 13f79535-47bb-0310-9956-ffa450edef68