]> granicus.if.org Git - apache/log
apache
10 years agoTweaks for SSLOpenSSLConfCmd:
Kaspar Brand [Sat, 30 Nov 2013 07:44:27 +0000 (07:44 +0000)]
Tweaks for SSLOpenSSLConfCmd:
- use cfgMergeArray, and reduce the size of the initial array
- move SSL_CONF_cmd calls from ssl_init_ctx_protocol to
  ssl_init_server_ctx (so they are applied after ssl_init_server_certs)
- add APLOG_DEBUG-level logging for the SSL_CONF_cmd success case
- call SSL_CONF_CTX_free(cctx) when done in ssl_init_server_ctx

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

10 years agoAxe dead code: It wouldn't have been needed ever since httpd 2.0.35
Kaspar Brand [Sat, 30 Nov 2013 07:17:53 +0000 (07:17 +0000)]
Axe dead code: It wouldn't have been needed ever since httpd 2.0.35
was released in April 2002... it was fixed in the [unreleased]
SSLeay 0.9.1b, which was the basis for the initial OpenSSL 0.9.1c
release in December 1998 (specifically, it's this change to ssl_set_pkey():
https://cvs.openssl.org/filediff?f=openssl/ssl/ssl_rsa.c&v1=1.1.1.2&v2=1.1.1.3)

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

10 years agoRemove obsolete TODOs for mod_ssl:
Kaspar Brand [Sat, 30 Nov 2013 06:49:58 +0000 (06:49 +0000)]
Remove obsolete TODOs for mod_ssl:

No, we don't - it was removed in r90511.

DH keys are changed for every connection, SSL_OP_SINGLE_DH_USE
is applied since mod_ssl's initial commit (r88988).

We no longer have our own CRL callback (delegated to OpenSSL
as of r1165056), so this is effectively moot.

ssl_engine_pphrase.c needs to be simplified, not blown up further
(see also https://issues.apache.org/bugzilla/show_bug.cgi?id=24031,
which few [if any] people really seem to miss)

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

10 years agoupdate transformations
Takashi Sato [Fri, 29 Nov 2013 14:43:30 +0000 (14:43 +0000)]
update transformations

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

10 years agofix XML validation error on r1543907
Takashi Sato [Fri, 29 Nov 2013 14:23:49 +0000 (14:23 +0000)]
fix XML validation error on r1543907

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

10 years agofix XML validation error on r1546534
Takashi Sato [Fri, 29 Nov 2013 14:21:34 +0000 (14:21 +0000)]
fix XML validation error on r1546534

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

10 years agocompat note for AuthLDAPBindPassword exec:
Eric Covener [Fri, 29 Nov 2013 10:55:49 +0000 (10:55 +0000)]
compat note for AuthLDAPBindPassword exec:

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

10 years agoList all APR dependencies
Gregg Lewis Smith [Thu, 28 Nov 2013 18:29:46 +0000 (18:29 +0000)]
List all APR dependencies
PR 54739

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

10 years agoFollow-up to r1538490:
Jeff Trawick [Tue, 26 Nov 2013 17:11:51 +0000 (17:11 +0000)]
Follow-up to r1538490:

Ensure that conn_rec->sbh is always cleared when returning from process_socket().

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

10 years agoFix error
Jim Jagielski [Mon, 25 Nov 2013 21:41:29 +0000 (21:41 +0000)]
Fix error

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

10 years agoConsistent types (2nd commit for future backport ease)
Jim Jagielski [Mon, 25 Nov 2013 21:24:20 +0000 (21:24 +0000)]
Consistent types (2nd commit for future backport ease)

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

10 years agoConsistent types
Jim Jagielski [Mon, 25 Nov 2013 21:24:18 +0000 (21:24 +0000)]
Consistent types

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

10 years agonaming suggestion re: trawick
Jim Jagielski [Mon, 25 Nov 2013 21:10:05 +0000 (21:10 +0000)]
naming suggestion re: trawick

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

10 years agoUse offset which is smack dab in the middle.
Jim Jagielski [Mon, 25 Nov 2013 18:28:53 +0000 (18:28 +0000)]
Use offset which is smack dab in the middle.

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

10 years agoUse correct type...
Jim Jagielski [Mon, 25 Nov 2013 15:40:16 +0000 (15:40 +0000)]
Use correct type...

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

10 years agor1545286 for eventopt
Jim Jagielski [Mon, 25 Nov 2013 14:08:17 +0000 (14:08 +0000)]
r1545286 for eventopt

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

10 years agoUse a normalized offset point for idlers... still need to worry
Jim Jagielski [Mon, 25 Nov 2013 13:59:06 +0000 (13:59 +0000)]
Use a normalized offset point for idlers... still need to worry
that atomics work as "expected", in this case that a add32 of a -1
is the "same" as dec32 (as far as effect on idlers)

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

10 years agorevert 1544876
Jim Jagielski [Mon, 25 Nov 2013 01:32:53 +0000 (01:32 +0000)]
revert 1544876

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

10 years agodrop a caveat with an outdated example, there is now "reallyall" documented above.
Eric Covener [Sun, 24 Nov 2013 17:32:00 +0000 (17:32 +0000)]
drop a caveat with an outdated example, there is now "reallyall" documented above.

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

10 years agoJust critically warn people... but keep pushing through.
Jim Jagielski [Sat, 23 Nov 2013 20:29:55 +0000 (20:29 +0000)]
Just critically warn people... but keep pushing through.

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

10 years agoUpdates.
Lucien Gentis [Sat, 23 Nov 2013 15:59:20 +0000 (15:59 +0000)]
Updates.

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

10 years agomod_lua: Fix compiler warning by using correct
Rainer Jung [Sat, 23 Nov 2013 15:45:31 +0000 (15:45 +0000)]
mod_lua: Fix compiler warning by using correct
APR_SIZE_T_FMT and APR_OFF_T_FMT format macro
in debug logging.

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

10 years agoFollowup to r1544774: do not ignore failures from ssl_server_import_{cert,key}
Kaspar Brand [Sat, 23 Nov 2013 15:01:08 +0000 (15:01 +0000)]
Followup to r1544774: do not ignore failures from ssl_server_import_{cert,key}
in ssl_init_server_certs

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

10 years agoRemove SSLPKCS7CertificateFile support:
Kaspar Brand [Sat, 23 Nov 2013 13:03:25 +0000 (13:03 +0000)]
Remove SSLPKCS7CertificateFile support:

- was never documented, so very unlikely that it was ever used

- adds complexity without apparent benefit; PKCS#7 files can
  be trivially converted to a file for use with SSLCertificateChainFile
  (concatenated X509 CERTIFICATE chunks, openssl pkcs7 -print_certs...)

- only supports PKCS7 files with PEM encoding, i.e. relies on a
  non-standardized PEM header (cf. RFC 2315 and draft-josefsson-pkix-textual)

- issues pointed out in http://mail-archives.apache.org/mod_mbox/httpd-dev/200607.mbox/%3C20060723093125.GA19423@redhat.com%3E
  were never fully addressed (cf. r424707 and r424735)

- has never worked in vhost context due to a cfgMergeString
  call missing from modssl_ctx_cfg_merge

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

10 years agoAddress a todo listed in
Kaspar Brand [Sat, 23 Nov 2013 12:22:47 +0000 (12:22 +0000)]
Address a todo listed in
https://mail-archives.apache.org/mod_mbox/httpd-dev/200205.mbox/%3CPine.LNX.4.33.0205292300380.27841-100000%40mako.covalent.net%3E
"init functions should return status code rather than ssl_die()"

For diagnostic purposes, ssl_die() is still there, but instead
of abruptly exit(1)ing, it will return APR_EGENERAL to the
ssl_init_* callers in ssl_engine_init.c, and these will propagate
the status back to ssl_init_Module.

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

10 years agogive a hint about the requirements for <If
Eric Covener [Fri, 22 Nov 2013 18:27:32 +0000 (18:27 +0000)]
give a hint about the requirements for <If

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

10 years agoinclude <if> in the list of things that are directory contexts before
Eric Covener [Fri, 22 Nov 2013 18:23:20 +0000 (18:23 +0000)]
include <if> in the list of things that are directory contexts before
clicking through to the sections.html

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

10 years agono more fcgi_protocol.h
Jeff Trawick [Fri, 22 Nov 2013 00:18:24 +0000 (00:18 +0000)]
no more fcgi_protocol.h

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

10 years agoFollow-up to r1541029:
Jeff Trawick [Thu, 21 Nov 2013 12:23:49 +0000 (12:23 +0000)]
Follow-up to r1541029:

Clarify handling of the directive argument

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

10 years agoFollow-up to r1539988:
Jeff Trawick [Wed, 20 Nov 2013 22:54:37 +0000 (22:54 +0000)]
Follow-up to r1539988:

Make sure an error log provider has initialized before trying to log to it.
(A log function may be called in a window between closing stderr and opening logs.)

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

10 years agoremove some new-ish entries for changes now in the 2.4.x branch
Jeff Trawick [Wed, 20 Nov 2013 21:09:29 +0000 (21:09 +0000)]
remove some new-ish entries for changes now in the 2.4.x branch

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

10 years agoxforms
Eric Covener [Wed, 20 Nov 2013 19:04:48 +0000 (19:04 +0000)]
xforms

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

10 years agodoc behavior change in r821333, CacheEnable foo / does not apply to forward
Eric Covener [Wed, 20 Nov 2013 19:04:19 +0000 (19:04 +0000)]
doc behavior change in r821333, CacheEnable foo / does not apply to forward
proxy.

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

10 years agoStringify ICON_FILE, like other values passed in via -Dxx=yy
Jeff Trawick [Tue, 19 Nov 2013 01:03:49 +0000 (01:03 +0000)]
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/trunk@1543282 13f79535-47bb-0310-9956-ffa450edef68

10 years agoCorrect logic... if this is a UDS socket, then bypass all
Jim Jagielski [Mon, 18 Nov 2013 21:37:05 +0000 (21:37 +0000)]
Correct logic... if this is a UDS socket, then bypass all
this.

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

10 years agoWorkaround issue with defining a preprocessor symbol to a string value
Jeff Trawick [Mon, 18 Nov 2013 20:57:52 +0000 (20:57 +0000)]
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/trunk@1543149 13f79535-47bb-0310-9956-ffa450edef68

10 years agofix versioninfo fields for abs.exe
Jeff Trawick [Mon, 18 Nov 2013 20:50:38 +0000 (20:50 +0000)]
fix versioninfo fields for abs.exe

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

10 years agofollow-up to r1542533:
Jeff Trawick [Mon, 18 Nov 2013 12:52:03 +0000 (12:52 +0000)]
follow-up to r1542533:

fix format string (unsigned vs. size_t)

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

10 years agoRemove useless spaces that are not in 2.4.x
Christophe Jaillet [Sun, 17 Nov 2013 19:42:41 +0000 (19:42 +0000)]
Remove useless spaces that are not in 2.4.x

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

10 years ago[trunk][doc] Introducing .fr translation for mod_auth_form.xml
Vincent Deffontaines [Sun, 17 Nov 2013 19:08:21 +0000 (19:08 +0000)]
[trunk][doc] Introducing .fr translation for mod_auth_form.xml

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

10 years ago[trunk][doc] Introducing .fr translation for relevant-standards.xml
Vincent Deffontaines [Sun, 17 Nov 2013 18:43:08 +0000 (18:43 +0000)]
[trunk][doc] Introducing .fr translation for relevant-standards.xml

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

10 years ago[trunk][doc] Introducing .fr translation for socache.xml
Vincent Deffontaines [Sun, 17 Nov 2013 18:33:12 +0000 (18:33 +0000)]
[trunk][doc] Introducing .fr translation for socache.xml

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

10 years ago[trunk][doc] Introducing .fr translation for getting-started.xml
Vincent Deffontaines [Sun, 17 Nov 2013 18:26:37 +0000 (18:26 +0000)]
[trunk][doc] Introducing .fr translation for getting-started.xml

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

10 years agoreword windows binaries text so it's clear that you may or may not see
Eric Covener [Sun, 17 Nov 2013 16:10:02 +0000 (16:10 +0000)]
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/trunk@1542752 13f79535-47bb-0310-9956-ffa450edef68

10 years agoHandle the gugz fix in APR 1.5.1 regarding duplicate
Jim Jagielski [Sun, 17 Nov 2013 14:22:58 +0000 (14:22 +0000)]
Handle the gugz fix in APR 1.5.1 regarding duplicate
keys.

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

10 years agoExplicitly list in which directories to look for config*.m4 files.
Stefan Fritsch [Sat, 16 Nov 2013 23:49:04 +0000 (23:49 +0000)]
Explicitly list in which directories to look for config*.m4 files.

If some distributor patches a config*.m4 file with quilt, that will
place a copy of the original file in .pc/ . Doing a naive "find ."
will then cause both the original and the patched m4 file to be included,
causing havoc later on.

PR: 55787

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

10 years agoWe were not being consistent between http and others
Jim Jagielski [Sat, 16 Nov 2013 20:13:48 +0000 (20:13 +0000)]
We were not being consistent between http and others
if we added the default port or not during the canonizing
phase... Baseline the http method (don't add unless the
port provided isn't the default).

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

10 years agomod_ssl: Don't flush when an EOS is received. Prepares mod_ssl
Graham Leggett [Sat, 16 Nov 2013 18:50:45 +0000 (18:50 +0000)]
mod_ssl: Don't flush when an EOS is received. Prepares mod_ssl
to support write completion.

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

10 years agoCheck all memory allocations and abort on failure
Stefan Fritsch [Sat, 16 Nov 2013 17:11:55 +0000 (17:11 +0000)]
Check all memory allocations and abort on failure

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

10 years agoUpdate.
Lucien Gentis [Sat, 16 Nov 2013 15:08:22 +0000 (15:08 +0000)]
Update.

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

10 years agoCompleting r1542515, where accents were not converted
Vincent Deffontaines [Sat, 16 Nov 2013 14:45:37 +0000 (14:45 +0000)]
Completing r1542515, where accents were not converted

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

10 years ago[trunk][doc] Introducing .fr translation for compliance.xml
Vincent Deffontaines [Sat, 16 Nov 2013 14:44:17 +0000 (14:44 +0000)]
[trunk][doc] Introducing .fr translation for compliance.xml

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

10 years agoapr_file_write_full() simplification (like r1542413 and r1542416)
Jeff Trawick [Sat, 16 Nov 2013 12:13:39 +0000 (12:13 +0000)]
apr_file_write_full() simplification (like r1542413 and r1542416)

hopefully I sidestepped the surprising conflation of OK/APR_SUCCESS
in this code

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

10 years agomore apr_file_write_full() simplification (like r1542413)
Jeff Trawick [Fri, 15 Nov 2013 22:03:16 +0000 (22:03 +0000)]
more apr_file_write_full() simplification (like r1542413)

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

10 years agoFollow-up to r1540161:
Jeff Trawick [Fri, 15 Nov 2013 21:52:58 +0000 (21:52 +0000)]
Follow-up to r1540161:

The last arg to apr_file_write_full() isn't needed
unless you need to know the number of bytes written before
an error occurred.

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

10 years agoPR: 54852. Only use a dummy_connection for idle processes
Jim Jagielski [Fri, 15 Nov 2013 19:29:11 +0000 (19:29 +0000)]
PR: 54852. Only use a dummy_connection for idle processes

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

10 years ago[Doc][trunk] Introducing french translation for misc/password_encryption
Vincent Deffontaines [Fri, 15 Nov 2013 18:30:46 +0000 (18:30 +0000)]
[Doc][trunk] Introducing french translation for misc/password_encryption

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

10 years ago[trunk][doc] Introducing the howto/index french translation
Vincent Deffontaines [Fri, 15 Nov 2013 18:14:55 +0000 (18:14 +0000)]
[trunk][doc] Introducing the howto/index french translation

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

10 years agoCGI is no longer the most common way to provide dynamic content, is it?
Vincent Deffontaines [Fri, 15 Nov 2013 18:02:29 +0000 (18:02 +0000)]
CGI is no longer the most common way to provide dynamic content, is it?

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

10 years agoFix potential rejection of valid MaxMemFree and ThreadStackSize
Jeff Trawick [Fri, 15 Nov 2013 17:35:16 +0000 (17:35 +0000)]
Fix potential rejection of valid MaxMemFree and ThreadStackSize
directives.

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

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

10 years agocmake build support for Windows is now in the 2.4.x branch; remove support for buildi...
Jeff Trawick [Thu, 14 Nov 2013 14:56:29 +0000 (14:56 +0000)]
cmake build support for Windows is now in the 2.4.x branch; remove support for building that branch

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

10 years agoUse a distinguishing APLOGNO for unk t-e with read-until-close behavior
William A. Rowe Jr [Wed, 13 Nov 2013 02:55:06 +0000 (02:55 +0000)]
Use a distinguishing APLOGNO for unk t-e with read-until-close behavior

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

10 years ago80 rule
Jim Jagielski [Tue, 12 Nov 2013 22:48:33 +0000 (22:48 +0000)]
80 rule

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

10 years agoWrap at 80 still, here at httpd project
William A. Rowe Jr [Tue, 12 Nov 2013 22:14:54 +0000 (22:14 +0000)]
Wrap at 80 still, here at httpd project

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

10 years agoAt least one authorizer that doesn't use libfcgi directly
Jeff Trawick [Tue, 12 Nov 2013 18:11:31 +0000 (18:11 +0000)]
At least one authorizer that doesn't use libfcgi directly
or indirectly does not like getting an empty FCGI_STDIN
block.  Don't send it.  (Other mods for httpd didn't send
it to authorizers either.)

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

10 years agoAdd parse_errorlog_arg callback to ap_errorlog_provider to allow providers
Jan Kaluža [Tue, 12 Nov 2013 12:14:50 +0000 (12:14 +0000)]
Add parse_errorlog_arg callback to ap_errorlog_provider to allow providers
to check the ErrorLog argument. Implement this check in mod_syslog.

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

10 years ago[trunk][doc] Introducing .fr translation for howto/access
Vincent Deffontaines [Mon, 11 Nov 2013 19:08:29 +0000 (19:08 +0000)]
[trunk][doc] Introducing .fr translation for howto/access

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

10 years agoUpdate.
Lucien Gentis [Sat, 9 Nov 2013 16:49:25 +0000 (16:49 +0000)]
Update.

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

10 years agoExpand some of these fields... mostlt it's the workers that we
Jim Jagielski [Sat, 9 Nov 2013 14:49:25 +0000 (14:49 +0000)]
Expand some of these fields... mostlt it's the workers that we
need to expand due to them mapping to actual hostnames

NOTE: 96 enough?

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

10 years agoAvoid the confusion... the digests are NOT strings.
Jim Jagielski [Fri, 8 Nov 2013 23:42:50 +0000 (23:42 +0000)]
Avoid the confusion... the digests are NOT strings.
Add some debug logging

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

10 years agoIf apr_file_read did return APR_EOF, then ensure that,
Jim Jagielski [Fri, 8 Nov 2013 20:51:44 +0000 (20:51 +0000)]
If apr_file_read did return APR_EOF, then ensure that,
as long as we read the right number of bytes, we
return APR_SUCCESS

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

10 years agoAllow for backwards compatibility for the md5 check...
Jim Jagielski [Fri, 8 Nov 2013 20:48:16 +0000 (20:48 +0000)]
Allow for backwards compatibility for the md5 check...
if we've read the slotmem data and we are at EOF, then
don't bother checking the md5 and assume all is OK.

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

10 years agowhitespace
Jim Jagielski [Fri, 8 Nov 2013 19:41:34 +0000 (19:41 +0000)]
whitespace

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

10 years agoError detection and a quick validity check when restoring...
Jim Jagielski [Fri, 8 Nov 2013 19:38:20 +0000 (19:38 +0000)]
Error detection and a quick validity check when restoring...
Designed to address errors, not nefarious changes.

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

10 years agoUDS urls need to be desockified when configuring...
Jim Jagielski [Fri, 8 Nov 2013 14:30:12 +0000 (14:30 +0000)]
UDS urls need to be desockified when configuring...

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

10 years agoEnsure that the file-based shm file is removed...
Jim Jagielski [Fri, 8 Nov 2013 14:30:08 +0000 (14:30 +0000)]
Ensure that the file-based shm file is removed...

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

10 years agoDo not lose log messages with NULL server_rec when error log provider is used.
Jan Kaluža [Fri, 8 Nov 2013 11:41:08 +0000 (11:41 +0000)]
Do not lose log messages with NULL server_rec when error log provider is used.

- set stderr_log to NULL after it is redirected to /dev/null
- use log provider of ap_server_conf in log_error_core when no server_rec
  is provided and std_err_log is NULL

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

10 years agoPR 55475: Detect incomplete body in HTTP input filter and return APR_INCOMPLETE
Jim Jagielski [Mon, 4 Nov 2013 21:31:27 +0000 (21:31 +0000)]
PR 55475: Detect incomplete body in HTTP input filter and return APR_INCOMPLETE

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

10 years agoc->sbh can be unexpectedly NULL when the thread that pulls the ready keepalive
Eric Covener [Mon, 4 Nov 2013 01:37:31 +0000 (01:37 +0000)]
c->sbh can be unexpectedly NULL when the thread that pulls the ready keepalive
connection out of the queue laps the thread that put it on the queue.

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

11 years agoRemove useless apr_pstrdup as done for other mod_auth modules in r1026660
Christophe Jaillet [Sat, 2 Nov 2013 08:22:25 +0000 (08:22 +0000)]
Remove useless apr_pstrdup as done for other mod_auth modules in r1026660

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

11 years agoxforms
Daniel Gruno [Fri, 1 Nov 2013 13:20:32 +0000 (13:20 +0000)]
xforms

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

11 years agoFixes to the modguide, courtesy of Petter Berntsen (sluggr)
Daniel Gruno [Fri, 1 Nov 2013 12:40:29 +0000 (12:40 +0000)]
Fixes to the modguide, courtesy of Petter Berntsen (sluggr)

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

11 years ago* support/rotatelogs.c: Introduce an adjusted_time_t type to store the
Joe Orton [Thu, 31 Oct 2013 21:58:31 +0000 (21:58 +0000)]
* support/rotatelogs.c: Introduce an adjusted_time_t type to store the
  weird "adjusted time since epoch" type returned by get_now().
  Switch from int to long to fix an unnecessary Y2K38 issue.  Adjust
  use throughout and clean up other type issues.  No functional change
  intended apart from fixing Y2K38.

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

11 years agoFor better compatibility with mod_nss:
Joe Orton [Thu, 31 Oct 2013 15:42:08 +0000 (15:42 +0000)]
For better compatibility with mod_nss:

* modules/ssl/ssl_engine_config.c (ssl_config_server_new): Default
  sc->enabled to UNSET.

* modules/ssl/ssl_engine_init.c (ssl_init_Module): Only override
  sc->enabled based on the protocol iff sc->enabled is UNSET; allows
  "SSLEngine off" to override the Listen-based default.

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

11 years agoTransforms.
Joe Orton [Mon, 28 Oct 2013 10:53:20 +0000 (10:53 +0000)]
Transforms.

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

11 years ago* docs/manual/upgrading.xml: Note 2.4 backwards-compat break for
Joe Orton [Mon, 28 Oct 2013 10:51:36 +0000 (10:51 +0000)]
* docs/manual/upgrading.xml: Note 2.4 backwards-compat break for
  some piped logging configurations.

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

11 years agothis was backported to 2.2, so not an upgrade issue.
Eric Covener [Sat, 26 Oct 2013 19:05:31 +0000 (19:05 +0000)]
this was backported to 2.2, so not an upgrade issue.

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

11 years ago/. Initialisations
Lucien Gentis [Sat, 26 Oct 2013 14:33:57 +0000 (14:33 +0000)]
/. Initialisations
if (! laCouleurFond) setCouleurFond(MENU_POPUP_COULEUR_FOND); else setCouleurFond(laCouleurFond);

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

11 years agoAllow for format specifiers to be used in the base substitution string for Header...
Daniel Ruggeri [Fri, 25 Oct 2013 17:16:46 +0000 (17:16 +0000)]
Allow for format specifiers to be used in the base substitution string for Header edit

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

11 years agoRemove unused APXS setting from template for generated Makefile
Jeff Trawick [Fri, 25 Oct 2013 11:36:00 +0000 (11:36 +0000)]
Remove unused APXS setting from template for generated Makefile

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

11 years agoSECURITY (CVE-2014-0231): Fix for DoS due to hang waiting for CGI script.
Eric Covener [Wed, 23 Oct 2013 19:26:08 +0000 (19:26 +0000)]
SECURITY (CVE-2014-0231): Fix for DoS due to hang waiting for CGI script.
Patch one of two.

Permit a read timeout to be used in mod_cgid to give up on a slow CGI script.

In trunk, it defaults to the servers Timeout.  PR43494

Submitted By: Eric Covener, Toshikuni Fukaya
Reviewed By: Eric Covener

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

11 years agoaxe some useless assignments (clang scan-build)
Jeff Trawick [Wed, 23 Oct 2013 12:03:04 +0000 (12:03 +0000)]
axe some useless assignments (clang scan-build)

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

11 years agodon't ignore some apr_procattr failures (clang scan-build)
Jeff Trawick [Wed, 23 Oct 2013 11:59:35 +0000 (11:59 +0000)]
don't ignore some apr_procattr failures (clang scan-build)

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

11 years agorotatelogs: Remove last constant length error buffer.
Ben Reser [Wed, 23 Oct 2013 05:14:45 +0000 (05:14 +0000)]
rotatelogs: Remove last constant length error buffer.

* support/rotatelogs.c
  (ERRMSGSZ): Remove.
  (rotate_status): Remove errbuff member.
  (truncate_and_write_error): Accept the error message as an argument.
  (doRotate): Shift the pool destruction slightly later and use it to generate
    the error message to pass truncate_and_write_error().
  (main): In case of write errors create a pool to generate the error message,
    since the other pools available may never been freed.  Adjust to pass
    message directly to truncate_and_write_error().

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

11 years agorotatelogs: Remove another use of a consant length buffer for errors.
Ben Reser [Wed, 23 Oct 2013 03:12:46 +0000 (03:12 +0000)]
rotatelogs: Remove another use of a consant length buffer for errors.

* support/rotatelogs.c
  (doRotate): Use apr_psprintf() and %pm.  Move the destruction of the pool
    after we're done with the error message so the error string stays allocated
    long enough.

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

11 years agorotatelogs: Use apr_psprintf() with %pm instead of a constant length buffer for
Ben Reser [Wed, 23 Oct 2013 03:01:05 +0000 (03:01 +0000)]
rotatelogs: Use apr_psprintf() with %pm instead of a constant length buffer for
errors.

* support/rotatelogs.c
  (post_rotate, doRotate): Switch to using apr_psprintf() with %pm.

Suggested by: rpluem

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

11 years agodon't pass uninitialized rv passed to ap_log_rerror()
Jeff Trawick [Wed, 23 Oct 2013 01:32:32 +0000 (01:32 +0000)]
don't pass uninitialized rv passed to ap_log_rerror()
  (rv wasn't interesting / follow an existing example)

stop throwing away a pointer on the heap

(clang scan-build)

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

11 years agoaxe attempt to close a previously-closed apr socket
Jeff Trawick [Wed, 23 Oct 2013 01:25:05 +0000 (01:25 +0000)]
axe attempt to close a previously-closed apr socket
(clang scan-build says "uninitialized", but it doesn't know
how apr_sockaddr_info_get() reports errors)

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

11 years agoaxe unused autodata+heap (clang scan-build)
Jeff Trawick [Wed, 23 Oct 2013 01:23:18 +0000 (01:23 +0000)]
axe unused autodata+heap (clang scan-build)

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

11 years agoSSL_CONF support for files and directories.
Stephen Henson [Tue, 22 Oct 2013 19:55:43 +0000 (19:55 +0000)]
SSL_CONF support for files and directories.

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