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

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

Stringify ICON_FILE, like other values passed in via -Dxx=yy

With an out of tree build like cmake, certain paths to the source tree and icon
file can foil parsing of this line by the resource compiler unless the path is
quoted.

Submitted by: Bert Huijben
Reviewed by: trawick


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

fix versioninfo fields for abs.exe

Workaround issue with defining a preprocessor symbol to a string value
with embedded blanks.

The extra, escaped quoting in the original version is required for passing 
the definition over the command-line, but it broke Visual Studio builds.

For now, avoid the extra quoting when generating for Visual Studio.

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

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

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

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

trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1540161
             https://svn.apache.org/viewvc?view=revision&revision=1540163
             https://svn.apache.org/viewvc?view=revision&revision=1540178
             https://svn.apache.org/viewvc?view=revision&revision=1540179
             https://svn.apache.org/viewvc?view=revision&revision=1540220
             http://svn.apache.org/viewvc?view=revision&revision=r1542413
2.4.x patch: http://people.apache.org/~jim/patches/slotmem-error2.patch

Submitted by: jim
Reviewed by: jorton, minfrin



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

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

reword windows binaries text so it's clear that you may or may not see
binaries for a given release.  Remove a "HTTPd" term that looked funny.




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

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

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

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

trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1451706
             http://svn.apache.org/viewvc?view=revision&revision=1517365
             http://svn.apache.org/viewvc?view=revision&revision=1529442
2.4.x patch: http://people.apache.org/~jim/patches/httpd-2.4-event-v3.patch

Submitted by: jim
Reviewed by: rjung, minfrin



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

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

and align w/ trunk.

trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1409214
             http://svn.apache.org/viewvc?view=revision&revision=1410004
2.4.x patch: http://people.apache.org/~jim/patches/httpd-2.4-podx-v2.patch

Submitted by: jim
Reviewed by: rjung, minfrin


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

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

trunk patch: https://svn.apache.org/r1542338

Submitted by: Mike Rumph <mike.rumph oracle.com>
Reviewed by: trawick, covener, sf


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

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

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

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

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

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

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

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

Switch from private FastCGI protocol handling to util_fcgi API.


Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.


Bring some envvar flexibility from mod_authnz_fcgi to mod_proxy_fcgi:

mod_proxy_fcgi: Remove 64K limit on encoded length of all envvars.
An individual envvar with an encoded length of more than 16K will be
omitted.


Borrow a fix from mod_authnz_fcgi:

mod_proxy_fcgi: Handle reading protocol data that is split between
packets.


Use ap_log_rdata() to dump the FastCGI header, axing a bunch
of custom data dumping code.

Submitted by: trawick, jkaluza, trawick, trawick, trawick
Reviewed/backported by: jim


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

Eclipse code analysis warning

Reduce stack usage by 3k

style fixes, add comment

no code change


attribute and error reason reversed

Submitted by: jim, jailletc36, sf, covener
Reviewed/backported by: jim


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

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

Streamline ephemeral key handling:

- drop support for ephemeral RSA keys (only allowed/needed
  for export ciphers)

- drop pTmpKeys from the per-process SSLModConfigRec, and remove
  the temp key generation at startup (unnecessary for DHE/ECDHE)

- unconditionally disable null and export-grade ciphers by always
  prepending "!aNULL:!eNULL:!EXP:" to any cipher suite string

- do not configure per-connection SSL_tmp_*_callbacks, as it is
  sufficient to set them for the SSL_CTX

- set default curve for ECDHE at startup, obviating the need
  for a per-handshake callback, for the time being (and also
  configure SSL_OP_SINGLE_ECDH_USE, previously left out)

For additional background, see
https://mail-archives.apache.org/mod_mbox/httpd-dev/201309.mbox/%3C52358ED1.2070704@velox.ch%3E


Follow-up fixes for r1526168:

- drop SSL_TMP_KEY_* constants from ssl_private.h, too

- make sure we also disable aNULL, eNULL and EXP ciphers
  for per-directory SSLCipherSuite directives

- apply the same treatment to SSLProxyCipherSuite


Increase minimum required OpenSSL version to 0.9.8a (in preparation
for the next mod_ssl commit, which will rely on the get_rfcX_prime_Y
functions added in that release):

- remove obsolete #defines / macros

- in ssl_private.h, regroup definitions based on whether
  they depend on TLS extension support or not

- for ECC and SRP support, set HAVE_X and change the rather awkward
  #ifndef OPENSSL_NO_X lines accordingly

For the discussion prior to taking this step, see
https://mail-archives.apache.org/mod_mbox/httpd-dev/201309.mbox/%3C524275C7.9060408%40velox.ch%3E


Improve ephemeral key handling (companion to r1526168):

- allow to configure custom DHE or ECDHE parameters via the
  SSLCertificateFile directive, and adapt its documentation
  accordingly (addresses PR 49559)

- add standardized DH parameters from RFCs 2409 and 3526,
  use them based on the length of the certificate's RSA/DSA key,
  and add a FAQ entry for clients which limit DH support
  to 1024 bits (such as Java 7 and earlier)

- move ssl_dh_GetParamFromFile() from ssl_engine_dh.c to
  ssl_util_ssl.c, and add ssl_ec_GetParamFromFile()

- drop ssl_engine_dh.c from mod_ssl

For the standardized DH parameters, OpenSSL version 0.9.8a
or later is required, which was therefore made a new minimum
requirement in r1527294.


PR 55616 (add missing APLOGNO), part 2
Submitted by: kbrand
Reviewed/backported by: jim


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

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

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

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

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

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

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

Add experimental cmake-based build system for Windows.

(Support for both trunk and 2.4.x has been removed for this first commit
to the 2.4.x branch.)

Thanks tdonovan for sharing your earlier version!  A lot
of good stuff is from Tom; a lot of bad stuff is from me.



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

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

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

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

ready, but are being made ready. Basically, a holding
place for stuff that should be considered for backporting.



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