granicus.if.org Git - apache/log

]> granicus.if.org Git - apache/log

projects / apache / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Jim Jagielski [Thu, 9 Jan 2014 14:28:39 +0000 (14:28 +0000)]

Merge r1524368, r1524388 from trunk:

Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.

Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.

Document r1524368 in CHANGES.

Submitted by: jkaluza
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Thu, 9 Jan 2014 14:25:50 +0000 (14:25 +0000)]

comment

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

commit | commitdiff | tree

Jeff Trawick [Wed, 8 Jan 2014 19:24:59 +0000 (19:24 +0000)]

confused?

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

commit | commitdiff | tree

Eric Covener [Wed, 8 Jan 2014 17:51:31 +0000 (17:51 +0000)]

vote/promote

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

commit | commitdiff | tree

Jeff Trawick [Wed, 8 Jan 2014 13:09:47 +0000 (13:09 +0000)]

vote/note/promote/etc.

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

commit | commitdiff | tree

Ben Reser [Wed, 8 Jan 2014 03:03:23 +0000 (03:03 +0000)]

* STATUS: Nominate r1556428 for backport to 2.4.x

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

commit | commitdiff | tree

Kaspar Brand [Tue, 7 Jan 2014 17:52:34 +0000 (17:52 +0000)]

Backport r1544784 from trunk:

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

Proposed by: kbrand
Reviewed by: covener, druggeri

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

commit | commitdiff | tree

Eric Covener [Tue, 7 Jan 2014 01:56:52 +0000 (01:56 +0000)]

Merge r1556102 from trunk:

add some information about setenvif vs. subrequests for PR55957

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

commit | commitdiff | tree

Christophe Jaillet [Mon, 6 Jan 2014 19:52:28 +0000 (19:52 +0000)]

Fix a few typo in doc that have only been corrected on trunk

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

commit | commitdiff | tree

Daniel Ruggeri [Mon, 6 Jan 2014 18:17:15 +0000 (18:17 +0000)]

easy votes

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

commit | commitdiff | tree

Jim Jagielski [Mon, 6 Jan 2014 17:04:32 +0000 (17:04 +0000)]

event fdq fix proposal.

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

commit | commitdiff | tree

Eric Covener [Mon, 6 Jan 2014 16:45:29 +0000 (16:45 +0000)]

Merge r1555908 from trunk:

use authz_core instead of access_compat in example

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

commit | commitdiff | tree

Jeff Trawick [Mon, 6 Jan 2014 16:09:42 +0000 (16:09 +0000)]

merge r1555423 from trunk:

fix typo in error message

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

commit | commitdiff | tree

Jeff Trawick [Mon, 6 Jan 2014 16:05:52 +0000 (16:05 +0000)]

xforms

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

commit | commitdiff | tree

Jeff Trawick [Mon, 6 Jan 2014 16:02:57 +0000 (16:02 +0000)]

merge r1555424 from trunk:

document on/off parameter in the usual manner and show defaults for
SSLHonorCipherOrder, SSLOCSPEnable, SSLOCSPOverrideResponder, and
SSLInsecureRenegotiation

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

commit | commitdiff | tree

Eric Covener [Mon, 6 Jan 2014 14:12:41 +0000 (14:12 +0000)]

Merge r1542615 from trunk:

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

Submitted by: sf
Reviewed by: trawick, covener

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

commit | commitdiff | tree

Eric Covener [Mon, 6 Jan 2014 14:09:18 +0000 (14:09 +0000)]

Merge r1546805 from trunk:

SGC became dead in January 2000, effectively
(http://www.gpo.gov/fdsys/pkg/FR-2000-01-14/pdf/00-983.pdf)
Almost 14 years later, there's certainly no longer any need
to spit out some fancy log message.

Submitted by: kbrand
Reviewed by: covener, trawick

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

commit | commitdiff | tree

Eric Covener [Mon, 6 Jan 2014 14:07:02 +0000 (14:07 +0000)]

vote/promote

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

commit | commitdiff | tree

Jeff Trawick [Mon, 6 Jan 2014 12:04:25 +0000 (12:04 +0000)]

merge r1551802 from trunk:

mod_ldap: restrict a recent WIN32 change to only apply when the MS SDK is used.

Submitted by: covener:
Reviewed by: jim, trawick

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

commit | commitdiff | tree

Jeff Trawick [Mon, 6 Jan 2014 12:02:38 +0000 (12:02 +0000)]

Merge from trunk r1547845:

mod_cache_disk: Fix potential hangs on Windows when using mod_cache_disk.

PR: 55833
Submitted by: covener
Reviewed by: jim, trawick

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

commit | commitdiff | tree

Kaspar Brand [Mon, 6 Jan 2014 06:26:26 +0000 (06:26 +0000)]

update transformations for SSLOpenSSLConfCmd

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

commit | commitdiff | tree

Kaspar Brand [Mon, 6 Jan 2014 06:02:42 +0000 (06:02 +0000)]

Backport r1421323, r1534754, r1546693, r1555464 from trunk:

Add support for OpenSSL configuration commands by introducing
the SSLOpenSSLConfCmd directive.

Proposed by: kbrand
Reviewed by: drh, trawick

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

commit | commitdiff | tree

Jeff Trawick [Sun, 5 Jan 2014 22:27:02 +0000 (22:27 +0000)]

vote, promote

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

commit | commitdiff | tree

Jeff Trawick [Sun, 5 Jan 2014 22:17:53 +0000 (22:17 +0000)]

slightly more consistent formatting

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

commit | commitdiff | tree

Jeff Trawick [Sun, 5 Jan 2014 21:39:14 +0000 (21:39 +0000)]

r1544381 was merged a while back (and I still had this change in a checkout)

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

commit | commitdiff | tree

Christophe Jaillet [Sun, 5 Jan 2014 18:34:10 +0000 (18:34 +0000)]

Sync a few doc with trunk (fr)

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

commit | commitdiff | tree

Christophe Jaillet [Sun, 5 Jan 2014 18:33:42 +0000 (18:33 +0000)]

Sync a few doc with trunk

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

commit | commitdiff | tree

Stephen Henson [Sun, 5 Jan 2014 16:45:58 +0000 (16:45 +0000)]

vote

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 5 Jan 2014 16:30:49 +0000 (16:30 +0000)]

Merge r1555569:

adjust compat info for named capturing groups

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:30:16 +0000 (16:30 +0000)]

2 ez proposals

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 5 Jan 2014 16:25:33 +0000 (16:25 +0000)]

xforms

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:20:29 +0000 (16:20 +0000)]

Adjust and sync with what was in trunk

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:18:52 +0000 (16:18 +0000)]

Cleanup CHANGES a bit...

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 5 Jan 2014 16:18:46 +0000 (16:18 +0000)]

Merge r1555555 from trunk:
axe one more case of digest auth being described as secure

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:15:38 +0000 (16:15 +0000)]

Merge r1551714 from trunk:

Avoid sending back uninitialized memory, use 'ftpmessage' in order to have something meaningful instead.

Save 8k of stack by the same time.
Submitted by: jailletc36
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:15:08 +0000 (16:15 +0000)]

Merge r1552227 from trunk:

Remove <Proxy ~ wildcard-url> syntax which:
   - is equivalent to <ProxyMatch wildcard-url>
   - has never been documented
   - incorrectly checks parameters (!cmd->path should be !cmd->path[0])
   - is buggy (! is missing in front of strncasecmp)
Submitted by: jailletc36
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:14:26 +0000 (16:14 +0000)]

Merge r1554300, r1554301, r1554994, r1555266 from trunk:

core: Support named groups and backreferences within the LocationMatch,
DirectoryMatch, FilesMatch and ProxyMatch directives.

Documentation for the support of named groups and backreferences.

c89 fix

Add a "MATCH_" prefix to variables set within
LocationMatch/DirectoryMatch/FilesMatch.

Submitted by: minfrin, covener, minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:13:20 +0000 (16:13 +0000)]

Merge r1554195 from trunk:

mod_authz_user: Support the expression parser within the require directives.

Submitted by: minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:12:20 +0000 (16:12 +0000)]

Merge r1554188 from trunk:

mod_authnz_host: Support the expression parser within the require directives.

Submitted by: minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:11:44 +0000 (16:11 +0000)]

Merge r1554175, r1554184 from trunk:

mod_authnz_groupfile: Support the expression parser within the require directives.

Pass the correct pointer that made it past the test suite.

Submitted by: minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 5 Jan 2014 16:11:29 +0000 (16:11 +0000)]

xforms

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:10:54 +0000 (16:10 +0000)]

Merge r1554170, r1554181 from trunk:

mod_authnz_dbm: Support the expression parser within the require directives.

Pass the correct pointer that made it past the test suite.

Submitted by: minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:10:09 +0000 (16:10 +0000)]

Merge r1554168, r1554176 from trunk:

mod_authnz_dbd: Support the expression parser within the require directives.

Pass the correct pointer that made it past the test suite.

Submitted by: minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:09:07 +0000 (16:09 +0000)]

Merge r1554161 from trunk:

mod_authnz_ldap: Support the expression parser within the require
directives.

Submitted by: minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 5 Jan 2014 16:06:53 +0000 (16:06 +0000)]

Merge r1554276, r1554281 from trunk:

    digest auth is only marginally more secure than basic auth.
    Adjust the docs to today's reality.

    mention insecure password storage as pointed out by Graham

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:05:08 +0000 (16:05 +0000)]

ipromote!

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:04:19 +0000 (16:04 +0000)]

ivote!

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 5 Jan 2014 16:02:48 +0000 (16:02 +0000)]

propose

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

commit | commitdiff | tree

Kaspar Brand [Sun, 5 Jan 2014 08:46:55 +0000 (08:46 +0000)]

propose a couple of mod_ssl backports

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

commit | commitdiff | tree

Kaspar Brand [Sun, 5 Jan 2014 08:37:21 +0000 (08:37 +0000)]

Complement to r1542327 (Streamline and improve ephemeral key handling):
the change to acinclude.m4 (part of r1527294) was left out from the
backport proposal by mistake.

Originally proposed by: kbrand. Reviewed by: jim, jorton (cf. r1542297).

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

commit | commitdiff | tree

Eric Covener [Sat, 4 Jan 2014 17:41:08 +0000 (17:41 +0000)]

exercise my rights as a 'merican

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

commit | commitdiff | tree

Lucien Gentis [Sat, 4 Jan 2014 16:36:55 +0000 (16:36 +0000)]

Updates.

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

commit | commitdiff | tree

Graham Leggett [Fri, 3 Jan 2014 22:28:58 +0000 (22:28 +0000)]

Add "MATCH_" prefix to the proposal, add covener's fix, reset the vote.

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 3 Jan 2014 20:45:28 +0000 (20:45 +0000)]

2 proposals

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

commit | commitdiff | tree

Eric Covener [Fri, 3 Jan 2014 15:03:47 +0000 (15:03 +0000)]

Merge r1555116 from trunk:

emphasize that this is mostly just AAA checks and not the status
code of the handler. PR21828 and various dups.

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

commit | commitdiff | tree

Jim Jagielski [Fri, 3 Jan 2014 14:48:11 +0000 (14:48 +0000)]

ivote!

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

commit | commitdiff | tree

Daniel Gruno [Fri, 3 Jan 2014 12:20:13 +0000 (12:20 +0000)]

mod_lua: Detect "All" or "None" before putting together a potentially blank (or static) string.

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

commit | commitdiff | tree

Eric Covener [Fri, 3 Jan 2014 02:31:21 +0000 (02:31 +0000)]

add tweak

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

commit | commitdiff | tree

Eric Covener [Fri, 3 Jan 2014 02:29:39 +0000 (02:29 +0000)]

propose fix for AuthnProviderAlias providers in VH context

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

commit | commitdiff | tree

Rich Bowen [Thu, 2 Jan 2014 18:04:43 +0000 (18:04 +0000)]

Oops, missed one. s/2013/2014/

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

commit | commitdiff | tree

Rich Bowen [Thu, 2 Jan 2014 18:02:15 +0000 (18:02 +0000)]

s/2013/2014/

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

commit | commitdiff | tree

Rich Bowen [Thu, 2 Jan 2014 17:58:33 +0000 (17:58 +0000)]

s/2013/2014/

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

commit | commitdiff | tree

Rich Bowen [Thu, 2 Jan 2014 17:53:59 +0000 (17:53 +0000)]

Add BitNami to binaries list

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

commit | commitdiff | tree

Jim Jagielski [Thu, 2 Jan 2014 13:34:35 +0000 (13:34 +0000)]

ivote!

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

commit | commitdiff | tree

André Malo [Tue, 31 Dec 2013 13:11:44 +0000 (13:11 +0000)]

update transformation

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

commit | commitdiff | tree

André Malo [Tue, 31 Dec 2013 13:07:20 +0000 (13:07 +0000)]

validate.

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

commit | commitdiff | tree

André Malo [Tue, 31 Dec 2013 13:06:15 +0000 (13:06 +0000)]

validate. properties.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 20:11:15 +0000 (20:11 +0000)]

Propose.

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

commit | commitdiff | tree

Jim Jagielski [Mon, 30 Dec 2013 13:29:45 +0000 (13:29 +0000)]

Merge r1488492, r1542533, r1543020 from trunk:

Check if malloc succeeded
PR54344 [Bill Parker, wp02855 gmail com]

Check all memory allocations and abort on failure

follow-up to r1542533:

fix format string (unsigned vs. size_t)

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

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

commit | commitdiff | tree

Jim Jagielski [Mon, 30 Dec 2013 13:28:34 +0000 (13:28 +0000)]

vote (by inspection)

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 12:08:09 +0000 (12:08 +0000)]

Propose.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 11:54:19 +0000 (11:54 +0000)]

Propose.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 11:52:49 +0000 (11:52 +0000)]

Propose.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 10:53:56 +0000 (10:53 +0000)]

Update the proposal.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 10:23:14 +0000 (10:23 +0000)]

Update the proposal.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 09:54:21 +0000 (09:54 +0000)]

Propose.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 09:41:34 +0000 (09:41 +0000)]

Propose.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 07:58:14 +0000 (07:58 +0000)]

Propose.

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

commit | commitdiff | tree

Eric Covener [Sun, 29 Dec 2013 15:49:35 +0000 (15:49 +0000)]

vote/promote

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

commit | commitdiff | tree

Jim Jagielski [Sun, 29 Dec 2013 15:47:32 +0000 (15:47 +0000)]

vote

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 18:25:04 +0000 (18:25 +0000)]

mod_proxy_http: Core dumped under high load. PR 50335

trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1534321
http://svn.apache.org/viewvc?view=revision&revision=1550061

Submitted by: Jan Kaluza <jkaluza redhat.com>
Reviewed by: jim, jorton, minfrin

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 18:18:41 +0000 (18:18 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 18:08:28 +0000 (18:08 +0000)]

* easy proposals to synch 2.4.x and trunk
  - log.c: avoid needless apr_pstrdup()
  - Use apr_pstrmemdup instead of apr_pstrndup when this is safe.
  - Use apr_pstrmemdup instead of apr_pstrndup when this is safe.
  - Remove redundant check
  - 'ap_getword_conf' does not return NULL but an empty string
  - Ease logic around 'ap_getword_conf' and drop useless line of code.
  - 'ap_getword_conf' can not return NULL
  - 'ap_getword_conf' can not return NULL
  - Remove redundant check (already performed the line before)
  - Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable
trunk patches:
  - https://svn.apache.org/viewvc?view=revision&revision=1532122
  - https://svn.apache.org/viewvc?view=revision&revision=1549676
  - https://svn.apache.org/viewvc?view=revision&revision=1549680
  - https://svn.apache.org/viewvc?view=revision&revision=1550651
  - https://svn.apache.org/viewvc?view=revision&revision=1551005
  - https://svn.apache.org/viewvc?view=revision&revision=1551009
  - https://svn.apache.org/viewvc?view=revision&revision=1551010
  - https://svn.apache.org/viewvc?view=revision&revision=1551011
  - https://svn.apache.org/viewvc?view=revision&revision=1551012
  - https://svn.apache.org/viewvc?view=revision&revision=1551013
2.4.x patches: trunk patches work
               http://people.apache.org/~jim/patches/ez-2.4-v2.patch
+1: jailletc36, jim, minfrin

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 18:06:22 +0000 (18:06 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 18:01:53 +0000 (18:01 +0000)]

* easy proposals to synch 2.4.x and trunk
  - Use apr_file_printf(... "%pm"...) instead of explicit call to apr_strerror
  - remove unused variables
  - axe some useless assignments (clang scan-build)
  - Remove useless apr_pstrdup as done for other mod_auth modules in r1026660
  - Remove unused APXS setting from template for generated Makefile

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 17:59:15 +0000 (17:59 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 17:55:04 +0000 (17:55 +0000)]

Comment.

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 17:16:34 +0000 (17:16 +0000)]

Backport 1553514:
rpm spec file: Ensure that apr-util-ldap is installed when mod_authnz_ldap
is installed.

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

commit | commitdiff | tree

Vincent Deffontaines [Thu, 26 Dec 2013 16:12:03 +0000 (16:12 +0000)]

[2.4][doc] mod_dir.xml r1553503 backport - Document 3xx DirectoryIndexRedirect codes

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

commit | commitdiff | tree

Vincent Deffontaines [Thu, 26 Dec 2013 16:01:05 +0000 (16:01 +0000)]

[2.4][doc] mod_dir.xml r1553502 backport - Document 3xx DirectoryIndexRedirect codes

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

commit | commitdiff | tree

André Malo [Thu, 26 Dec 2013 15:23:06 +0000 (15:23 +0000)]

fixup properties

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

commit | commitdiff | tree

André Malo [Thu, 26 Dec 2013 15:17:50 +0000 (15:17 +0000)]

update transformation

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

commit | commitdiff | tree

Eric Covener [Tue, 24 Dec 2013 20:04:48 +0000 (20:04 +0000)]

propose non-MSSDK windows fix

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

commit | commitdiff | tree

Eric Covener [Tue, 24 Dec 2013 16:41:34 +0000 (16:41 +0000)]

merge comments into propsoal, reset vote but include Jeff.

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

commit | commitdiff | tree

Eric Covener [Mon, 23 Dec 2013 13:32:38 +0000 (13:32 +0000)]

propose two small patches that didn't make it to 2.4 yet

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

commit | commitdiff | tree

Rainer Jung [Wed, 18 Dec 2013 15:21:28 +0000 (15:21 +0000)]

Remove proposal obsoleted by r1551932.

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

commit | commitdiff | tree

Eric Covener [Wed, 18 Dec 2013 15:03:19 +0000 (15:03 +0000)]

Merge r1551968 from trunk:

get arpa/inet.h from apr_want.h for htons where applicable

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

commit | commitdiff | tree

Jim Jagielski [Wed, 18 Dec 2013 13:10:23 +0000 (13:10 +0000)]

Merge r1493921, r1515162 from trunk:

mod_socache_shmcb.c: Remove arbitrary restriction on shared memory size
previously limited to 64MB.

Limit SHMCB_MAX_SIZE to min(UINT_MAX, APR_SIZE_MAX) to match the current code

Submitted by: minfrin, sf
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Wed, 18 Dec 2013 13:07:32 +0000 (13:07 +0000)]

Promote...

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

commit | commitdiff | tree

Christophe Jaillet [Wed, 18 Dec 2013 05:34:18 +0000 (05:34 +0000)]

Remove a 1 empty line difference between trunk and 2.4.x that could break backport of r1551714.

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

Unnamed repository; edit this file 'description' to name the repository.