]> granicus.if.org Git - apache/log
apache
10 years agoFix a few things in french translation that were already fixed in trunk.
Christophe Jaillet [Thu, 24 Apr 2014 05:30:37 +0000 (05:30 +0000)]
Fix a few things in french translation that were already fixed in trunk.

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

10 years agoC89 and such
Daniel Gruno [Wed, 23 Apr 2014 14:42:18 +0000 (14:42 +0000)]
C89 and such

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

10 years agoMerge 1589413 from trunk:
Jeff Trawick [Wed, 23 Apr 2014 14:05:39 +0000 (14:05 +0000)]
Merge 1589413 from trunk:

tweaks to grammar and markup

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

10 years agoUpdates.
Lucien Gentis [Mon, 21 Apr 2014 16:34:18 +0000 (16:34 +0000)]
Updates.

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

10 years agofix lua_ap_requestbody (bad backport?)
Daniel Gruno [Mon, 21 Apr 2014 16:23:32 +0000 (16:23 +0000)]
fix lua_ap_requestbody (bad backport?)

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

10 years agoTypo in comment (r1588862 in trunk)
Christophe Jaillet [Mon, 21 Apr 2014 09:34:47 +0000 (09:34 +0000)]
Typo in comment (r1588862 in trunk)

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

10 years agoadd two mod_ssl proposals (TmpDH callback, OCSP stapling init)
Kaspar Brand [Mon, 21 Apr 2014 07:02:10 +0000 (07:02 +0000)]
add two mod_ssl proposals (TmpDH callback, OCSP stapling init)

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

10 years agoBackport r1588807
Daniel Gruno [Sun, 20 Apr 2014 17:56:41 +0000 (17:56 +0000)]
Backport r1588807

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

10 years agoupdate CHANGES
Daniel Gruno [Sun, 20 Apr 2014 14:04:59 +0000 (14:04 +0000)]
update CHANGES

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

10 years agomod_lua: backport the two parsebody fixes.
Daniel Gruno [Sun, 20 Apr 2014 14:02:22 +0000 (14:02 +0000)]
mod_lua: backport the two parsebody fixes.

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

10 years ago2.4-only: remove 2.3.9/2.3.10 trivia
Eric Covener [Sun, 20 Apr 2014 13:14:34 +0000 (13:14 +0000)]
2.4-only: remove 2.3.9/2.3.10 trivia

Merge r1588747 from trunk:

expr=value updates:
 update RequestHeader syntax,
 add compat to Header and RequestHeader

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

10 years agovote/promote
Jeff Trawick [Sun, 20 Apr 2014 11:14:12 +0000 (11:14 +0000)]
vote/promote

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

10 years agopropose CacheLock APR_EEXIST/APR_STATUS_IS_EEXIST() bug
Eric Covener [Sat, 19 Apr 2014 20:22:51 +0000 (20:22 +0000)]
propose CacheLock APR_EEXIST/APR_STATUS_IS_EEXIST() bug

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

10 years agoMerge r1588427 from trunk:
Jim Jagielski [Fri, 18 Apr 2014 15:29:20 +0000 (15:29 +0000)]
Merge r1588427 from trunk:

Also clear the error queue before calling SSL_CTX_use_certificate[_chain]_file
(workaround for OpenSSL versions before 0.9.8h, see
https://rt.openssl.org/Ticket/Display.html?user=guest&pass=guest&id=1513).

PR 56410.

Submitted by: kbrand
Reviewed/backported by: jim

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

10 years agoMerge r1587036, r1587040, r1587053, r1587654 from trunk:
Jim Jagielski [Fri, 18 Apr 2014 15:28:41 +0000 (15:28 +0000)]
Merge r1587036, r1587040, r1587053, r1587654 from trunk:

  *) mod_proxy_wstunnel: Don't pool backend websockets connections,
     because we need to handshake every time. PR 55890.
     [Eric Covener]

actually remove mod_reqtimeout, since the util_filter functions involved
only manipulate c->input_filters no matter what we pass. We need to make
copies of c->input_filters after, not before, it skips over reqtimeout.

Note: reqtimeout doesn't really interfere today with normal operation,
but this is misleading/confusing when dealing with other
wstunnel issues.

cleanup wstunnel error handling

Submitted By: covener, ylavic, Edward Lu
Commited By: covener

followup to r1587036.

if backend->close is set too early, proxy_util.c will close it right
away and then blow away the field.

Submitted by: covener
Reviewed/backported by: jim

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

10 years agoMerge r1543174, r1560367, r1560546, r1560689, r1560979, r1561137, r1561660 from trunk:
Jim Jagielski [Fri, 18 Apr 2014 15:27:42 +0000 (15:27 +0000)]
Merge r1543174, r1560367, r1560546, r1560689, r1560979, r1561137, r1561660 from trunk:

Correct logic... if this is a UDS socket, then bypass all
this.

make mod_rewrite and mod_proxy UDS work together...

Adjust url as required, following what we did to r->filename.
Save some cycles when searching...

Tuck away UDS path in request-rec, since worker isn't
thread-safe. Protect from NULL refs.

Reflow logic... pull UDS stuff out

handle leak. thx to Y^2

r->filename should maintain the proxy: prefix for PHP-FPM
Reviewed/backported by: jim

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

10 years agoMerge r1514255, r1514267 from trunk:
Jim Jagielski [Fri, 18 Apr 2014 15:26:01 +0000 (15:26 +0000)]
Merge r1514255, r1514267 from trunk:

follow-up to r813376:

finish reverting r808965 (ServerTokens set foo)

tweak syntax strings for ServerTokens
Submitted by: trawick
Reviewed/backported by: jim

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

10 years agoMerge r1546835, r1546836 from trunk:
Jim Jagielski [Fri, 18 Apr 2014 15:25:21 +0000 (15:25 +0000)]
Merge r1546835, r1546836 from trunk:

Follow-up to r1546759: Fix compilation when exception hooks aren't enabled.

avoid duplication of APR_HOOK_LINK invocations

Submitted by: trawick
Reviewed/backported by: jim

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

10 years agoipromote
Jim Jagielski [Fri, 18 Apr 2014 15:24:24 +0000 (15:24 +0000)]
ipromote

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

10 years agoivote
Jim Jagielski [Fri, 18 Apr 2014 15:23:49 +0000 (15:23 +0000)]
ivote

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

10 years agoVote for r1561385 and promote uds-rewrite.
Yann Ylavic [Fri, 18 Apr 2014 14:26:26 +0000 (14:26 +0000)]
Vote for r1561385 and promote uds-rewrite.

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

10 years agopropose mod_ssl SSLCertificateFile workaround for OpenSSL < 0.9.8h
Kaspar Brand [Fri, 18 Apr 2014 09:12:55 +0000 (09:12 +0000)]
propose mod_ssl SSLCertificateFile workaround for OpenSSL < 0.9.8h

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

10 years agoMerge r1585090 from trunk:
Kaspar Brand [Fri, 18 Apr 2014 08:29:11 +0000 (08:29 +0000)]
Merge r1585090 from trunk:

Bring SNI behavior into better conformance with RFC 6066:

- no longer send a warning-level unrecognized_name(112) alert
  when no matching vhost is found (PR 56241)

- at startup, only issue warnings about IP/port conflicts and name-based
  SSL vhosts when running with an OpenSSL without TLS extension support
  (almost 5 years after SNI was added to 2.2.x, the
  "[...] only work for clients with TLS server name indication support"
  warning feels obsolete)

Proposed by: kbrand
Reviewed by: jorton, ylavic

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

10 years agoAdd missing entry as suggested on dev list.
Christophe Jaillet [Thu, 17 Apr 2014 19:54:36 +0000 (19:54 +0000)]
Add missing entry as suggested on dev list.

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

10 years agoGrammar
Christophe Jaillet [Thu, 17 Apr 2014 19:11:06 +0000 (19:11 +0000)]
Grammar

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

10 years agoVote for build breakage fix.
Yann Ylavic [Thu, 17 Apr 2014 14:34:07 +0000 (14:34 +0000)]
Vote for build breakage fix.

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

10 years agoFix build breakage when exception hooks aren't enabled,
Jeff Trawick [Thu, 17 Apr 2014 14:24:52 +0000 (14:24 +0000)]
Fix build breakage when exception hooks aren't enabled,
introduced by r1587695 (and my silent killer proposal)

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

10 years agoVote and promote r1585090.
Yann Ylavic [Thu, 17 Apr 2014 14:03:32 +0000 (14:03 +0000)]
Vote and promote r1585090.

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

10 years agoVote and promote r1514255.
Yann Ylavic [Thu, 17 Apr 2014 13:57:59 +0000 (13:57 +0000)]
Vote and promote r1514255.

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

10 years agoMerge r1531672 from trunk:
Jim Jagielski [Thu, 17 Apr 2014 13:39:01 +0000 (13:39 +0000)]
Merge r1531672 from trunk:

mod_auth_form: Make sure the optional functions are loaded even when
the AuthFormProvider isn't specified.

Submitted by: minfrin
Reviewed/backported by: jim

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

10 years agoMerge r1585918 from trunk:
Jim Jagielski [Thu, 17 Apr 2014 13:38:14 +0000 (13:38 +0000)]
Merge r1585918 from trunk:

Only read "active" values from the key_files array. PR 56306.

Submitted by: kbrand
Reviewed/backported by: jim

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

10 years agoMerge r1585919 from trunk:
Jim Jagielski [Thu, 17 Apr 2014 13:37:04 +0000 (13:37 +0000)]
Merge r1585919 from trunk:

Reverse the order when merging global and vhost-level config arrays.
Putting the vhost-level elements last allows overriding global settings
(for the deprecated SSLRequire directive, the order is irrelevant,
all of them must be met, cf. ssl_engine_kernel.c:ssl_hook_Access).

Submitted by: kbrand
Reviewed/backported by: jim

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

10 years agoMerge r1546801 from trunk:
Jim Jagielski [Thu, 17 Apr 2014 13:36:05 +0000 (13:36 +0000)]
Merge r1546801 from trunk:

If the "value" argument is prefixed with expr=, parse it with ap_expr
rather than mod_headers' built-in format strings.

Submitted by: covener
Reviewed/backported by: jim

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

10 years agoVote and promotion.
Yann Ylavic [Thu, 17 Apr 2014 13:17:55 +0000 (13:17 +0000)]
Vote and promotion.

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

10 years agorebuild docs
Jeff Trawick [Thu, 17 Apr 2014 11:31:49 +0000 (11:31 +0000)]
rebuild docs

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

10 years agomerge r1588213 from trunk:
Jeff Trawick [Thu, 17 Apr 2014 11:30:36 +0000 (11:30 +0000)]
merge r1588213 from trunk:
  Add hint about RequestHeader

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

10 years agoVote, promote.
Joe Orton [Thu, 17 Apr 2014 09:04:12 +0000 (09:04 +0000)]
Vote, promote.

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

10 years agoMerged.
Joe Orton [Thu, 17 Apr 2014 09:00:58 +0000 (09:00 +0000)]
Merged.

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

10 years agoMerge r1587255 from trunk:
Joe Orton [Thu, 17 Apr 2014 09:00:36 +0000 (09:00 +0000)]
Merge r1587255 from trunk:

* support/rotatelogs.c (main): Prevent creation of zombies from
  post-rotate programs.

Reviewed by: druggeri, ylavic, covener

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

10 years agos/two/three/
Christophe Jaillet [Thu, 17 Apr 2014 05:38:49 +0000 (05:38 +0000)]
s/two/three/

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

10 years agomerge r1588065 from trunk
Gregg Lewis Smith [Wed, 16 Apr 2014 21:00:23 +0000 (21:00 +0000)]
merge r1588065 from trunk
add change to makefile.win missing from r1588054
which was merged to 2.4 in r1588064

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

10 years agoMerged /httpd/httpd/trunk:r1515403,1515411,1515420,1517175,1521909,1526647,1541181...
Jeff Trawick [Wed, 16 Apr 2014 20:44:14 +0000 (20:44 +0000)]
Merged /httpd/httpd/trunk:r1515403,1515411,1515420,1517175,1521909,1526647,1541181,1578762,1585054,1585072,1588054

mod_authnz_fcgi: New module to enable FastCGI authorizer
applications to authenticate and/or authorize clients.

Submitted by: trawick, jailletc36, gsmith
Approved by: trawick, jim, gsmith

(Thanks gsmith for the Windows build bits!)

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

10 years agovotes and promote
Gregg Lewis Smith [Wed, 16 Apr 2014 20:17:33 +0000 (20:17 +0000)]
votes and promote

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

10 years agoRevert r1587881, I have committed it to 2.4.x by a mistake. sorry.
Jan Kaluža [Wed, 16 Apr 2014 11:58:12 +0000 (11:58 +0000)]
Revert r1587881, I have committed it to 2.4.x by a mistake. sorry.

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

10 years agocore.xml: document Warning directive
Jan Kaluža [Wed, 16 Apr 2014 11:51:42 +0000 (11:51 +0000)]
core.xml: document Warning directive

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

10 years agovote/promote
Eric Covener [Wed, 16 Apr 2014 01:35:00 +0000 (01:35 +0000)]
vote/promote

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

10 years agowithdraw -0 and promote
Eric Covener [Wed, 16 Apr 2014 01:31:30 +0000 (01:31 +0000)]
withdraw -0 and promote

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

10 years agopropose a small mod_headers feature from trunk
Eric Covener [Wed, 16 Apr 2014 01:30:16 +0000 (01:30 +0000)]
propose a small mod_headers feature from trunk

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

10 years agoRemove -1 on UDS proposal.
Yann Ylavic [Tue, 15 Apr 2014 23:58:58 +0000 (23:58 +0000)]
Remove -1 on UDS proposal.

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

10 years agoMerge r1564437 from trunk:
Jim Jagielski [Tue, 15 Apr 2014 19:17:56 +0000 (19:17 +0000)]
Merge r1564437 from trunk:

* Do not parse URL in case of regular expression as they likely do not follow
  the URL syntax.

PR: 56074

Submitted by: rpluem
Reviewed/backported by: jim

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

10 years agoMerge r1580568 from trunk:
Jim Jagielski [Tue, 15 Apr 2014 19:17:12 +0000 (19:17 +0000)]
Merge r1580568 from trunk:

mod_reqtimeout: Resolve unexpected timeouts on keepalive requests
under the Event MPM. PR56216.

Submitted By: Frank Meier <frank meier ergon ch>
Committed By: covener

Submitted by: covener
Reviewed/backported by: jim

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

10 years agoMerge r1546759, r1546760 from trunk:
Jim Jagielski [Tue, 15 Apr 2014 19:15:02 +0000 (19:15 +0000)]
Merge r1546759, r1546760 from trunk:

Add suspend_connection and resume_connection hooks to notify modules
when the thread/connection relationship changes.  (Currently implemented
only for the Event MPM; should be implemented for all async MPMs.)

follow-up to r1546759: remove an inadvertently committed testcase
Submitted by: trawick
Reviewed/backported by: jim

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

10 years agoMerge r1585824 from trunk:
Jim Jagielski [Tue, 15 Apr 2014 19:13:30 +0000 (19:13 +0000)]
Merge r1585824 from trunk:

mod_proxy_fcgi: Fix sending of response without some HTTP headers
that might be set by filters.

The problem occurs when no body bytes were read while reading the
response headers, resulting in an empty brigade being sent down
the filter stack.  One particualr filter that mishandles the empty
initial brigade is mod_deflate.  It neglects to add to the response
header fields.

PR: 55558
Submitted by: Jim Riggs <jim riggs.me>
Reviewed by: trawick

Submitted by: trawick
Reviewed/backported by: jim

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

10 years agoMerge r1584878 from trunk:
Jim Jagielski [Tue, 15 Apr 2014 19:12:47 +0000 (19:12 +0000)]
Merge r1584878 from trunk:

Do not delete the wrong data from HTML code when a "http-equiv" meta tag specifies a Content-Type behind any other "http-equiv" meta tag.
PR 56287 [Micha Lenk <micha lenk info>]
Submitted by: jailletc36
Reviewed/backported by: jim

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

10 years agoMerge r1584884 from trunk:
Jim Jagielski [Tue, 15 Apr 2014 19:11:57 +0000 (19:11 +0000)]
Merge r1584884 from trunk:

Do not scan past the end of the buffer.
If no terminating delimiter is found, just leave things as it is
Submitted by: jailletc36
Reviewed/backported by: jim

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

10 years agoMerge r1584896 from trunk:
Jim Jagielski [Tue, 15 Apr 2014 19:11:31 +0000 (19:11 +0000)]
Merge r1584896 from trunk:

Do not perform a p+= 7 that could go past the end of the buffer in case we find a 'content' without a corresponding '='.

Should we need to deal with this case, a new search should be performed to find the real starting position of another potential 'content=' pattern.
Submitted by: jailletc36
Reviewed/backported by: jim

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

10 years agoA question...
Jim Jagielski [Tue, 15 Apr 2014 19:10:36 +0000 (19:10 +0000)]
A question...

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

10 years agopropose some recent wstunnel fixes together in a small bundle
Eric Covener [Tue, 15 Apr 2014 18:57:54 +0000 (18:57 +0000)]
propose some recent wstunnel fixes together in a small bundle

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

10 years agoVotes.
Yann Ylavic [Tue, 15 Apr 2014 17:51:28 +0000 (17:51 +0000)]
Votes.

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

10 years agoAdd FLUSH fix to mod_deflate bundle.
Yann Ylavic [Tue, 15 Apr 2014 17:32:14 +0000 (17:32 +0000)]
Add FLUSH fix to mod_deflate bundle.

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

10 years agoAdd EOS fix to mod_deflate bundle.
Yann Ylavic [Tue, 15 Apr 2014 15:43:13 +0000 (15:43 +0000)]
Add EOS fix to mod_deflate bundle.

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

10 years agoAdd <compatibility> notes for changes made in version 2.4.5 (and one forgotten in...
Christophe Jaillet [Mon, 14 Apr 2014 21:17:48 +0000 (21:17 +0000)]
Add <compatibility> notes for changes made in version 2.4.5 (and one forgotten in 2.4.8)

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

10 years agoPropose rotatelogs change
Daniel Ruggeri [Mon, 14 Apr 2014 18:02:04 +0000 (18:02 +0000)]
Propose rotatelogs change

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

10 years agoMerge r1572630, r1572611, r1572967, r1573229 from trunk:
Jim Jagielski [Mon, 14 Apr 2014 12:47:49 +0000 (12:47 +0000)]
Merge r1572630, r1572611, r1572967, r1573229 from trunk:

Redo what was reverted in r1572627.
Don't reuse a SSL backend connection whose SNI differs. PR 55782.
This may happen when ProxyPreserveHost is on and the proxy-worker
handles connections to different Hosts.

Follows up r1572606.
MMN minor bump required by proxy_conn_rec change.

mod_proxy: follows up r1572630.
Don't reuse a SSL backend connection with no SNI for a request requiring SNI.

mod_proxy: Add comment and avoid ternary operator as condition (no functional change).
Submitted by: ylavic
Reviewed/backported by: jim

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

10 years agopromote
Jim Jagielski [Mon, 14 Apr 2014 12:44:53 +0000 (12:44 +0000)]
promote

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

10 years agovote
Jim Jagielski [Mon, 14 Apr 2014 12:44:34 +0000 (12:44 +0000)]
vote

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

10 years agoAdd <compatibility> notes for changes made in version 2.4.7 + synch formating with...
Christophe Jaillet [Sun, 13 Apr 2014 21:04:22 +0000 (21:04 +0000)]
Add <compatibility> notes for changes made in version 2.4.7 + synch formating with 2.4.x

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

10 years agoRemove extra '<'
Christophe Jaillet [Sun, 13 Apr 2014 19:47:52 +0000 (19:47 +0000)]
Remove extra '<'

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

10 years agoAdd <compatibility> notes for changes made in version 2.4.8 + synch formating with...
Christophe Jaillet [Sun, 13 Apr 2014 16:33:31 +0000 (16:33 +0000)]
Add <compatibility> notes for changes made in version 2.4.8 + synch formating with 2.4.x

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

10 years agoUpdates.
Lucien Gentis [Sat, 12 Apr 2014 16:10:34 +0000 (16:10 +0000)]
Updates.

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

10 years agoProposals
Christophe Jaillet [Fri, 11 Apr 2014 20:11:33 +0000 (20:11 +0000)]
Proposals

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

10 years agoAdd log tags update to mod_deflate bundle.
Yann Ylavic [Fri, 11 Apr 2014 19:02:31 +0000 (19:02 +0000)]
Add log tags update to mod_deflate bundle.

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

10 years agoAdd <compatibility> notes for changes made in version 2.4.4 + fix default value for...
Christophe Jaillet [Thu, 10 Apr 2014 21:03:24 +0000 (21:03 +0000)]
Add <compatibility> notes for changes made in version 2.4.4 + fix default value for FallbackResource

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

10 years agoAdd <compatibility> notes for changes made in version 2.4.3 + fix some formating...
Christophe Jaillet [Thu, 10 Apr 2014 19:35:48 +0000 (19:35 +0000)]
Add <compatibility> notes for changes made in version 2.4.3 + fix some formating + backport things in trunk

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

10 years agoxforms
Eric Covener [Thu, 10 Apr 2014 19:35:04 +0000 (19:35 +0000)]
xforms

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

10 years agoMerge r1586437 from trunk:
Eric Covener [Thu, 10 Apr 2014 19:32:13 +0000 (19:32 +0000)]
Merge r1586437 from trunk:

This C-T: limitation was removed in 2.2.12 and retconned into CHANGES much later.

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

10 years agoVote for mod_authn_socache fix.
Yann Ylavic [Wed, 9 Apr 2014 20:46:16 +0000 (20:46 +0000)]
Vote for mod_authn_socache fix.

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

10 years agoVote and promote mod_auth_form fix (and remove duplicate).
Yann Ylavic [Wed, 9 Apr 2014 20:13:53 +0000 (20:13 +0000)]
Vote and promote mod_auth_form fix (and remove duplicate).

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

10 years agoadd a few mod_ssl backport proposals
Kaspar Brand [Wed, 9 Apr 2014 09:48:34 +0000 (09:48 +0000)]
add a few mod_ssl backport proposals

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

10 years agoUpdate SSLPassPhraseDialog directive docs to correctly describe the
Kaspar Brand [Wed, 9 Apr 2014 08:24:25 +0000 (08:24 +0000)]
Update SSLPassPhraseDialog directive docs to correctly describe the
current behavior for "exec"-type programs in 2.4.x, at least.
The new argument structure is a consequence of r1573360 (backport
to 2.4.8 [unreleased]).

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

10 years agoAdd <compatibility> notes for changes made in version 2.4.2 + fix a typo not backport...
Christophe Jaillet [Tue, 8 Apr 2014 20:29:24 +0000 (20:29 +0000)]
Add <compatibility> notes for changes made in version 2.4.2 + fix a typo not backported in 2.4 branch

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

10 years agomod_proxy_fcgi fix from Jim Riggs?
Jeff Trawick [Tue, 8 Apr 2014 20:14:59 +0000 (20:14 +0000)]
mod_proxy_fcgi fix from Jim Riggs?

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

10 years agoAdd mod_auth_form missing log tags.
Yann Ylavic [Mon, 7 Apr 2014 09:28:40 +0000 (09:28 +0000)]
Add mod_auth_form missing log tags.

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

10 years agoPropose mod_auth_form optional functions load changes.
Yann Ylavic [Mon, 7 Apr 2014 09:24:05 +0000 (09:24 +0000)]
Propose mod_auth_form optional functions load changes.

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

10 years agoUpdates.
Lucien Gentis [Sat, 5 Apr 2014 17:08:12 +0000 (17:08 +0000)]
Updates.

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

10 years agomonster
Jeff Trawick [Sat, 5 Apr 2014 12:56:30 +0000 (12:56 +0000)]
monster

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

10 years agoxforms
Jeff Trawick [Sat, 5 Apr 2014 12:33:39 +0000 (12:33 +0000)]
xforms

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

10 years agoa patch with the build bits is needed for reviewing mod_authnz_fcgi
Jeff Trawick [Sat, 5 Apr 2014 12:04:22 +0000 (12:04 +0000)]
a patch with the build bits is needed for reviewing mod_authnz_fcgi

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

10 years agomod_authnz_fcgi...
Jeff Trawick [Fri, 4 Apr 2014 23:44:32 +0000 (23:44 +0000)]
mod_authnz_fcgi...

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

10 years agoFollup to r1584684: AcceptFilter was wrongly turned into a Windows specific feature.
Yann Ylavic [Fri, 4 Apr 2014 14:16:25 +0000 (14:16 +0000)]
Follup to r1584684: AcceptFilter was wrongly turned into a Windows specific feature.

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

10 years agoAdd compatibility changes to SSLOCSPUseRequestNonce (manual) proposal.
Yann Ylavic [Fri, 4 Apr 2014 14:08:00 +0000 (14:08 +0000)]
Add compatibility changes to SSLOCSPUseRequestNonce (manual) proposal.
Remove other manual changes proposal (CTR, already backported).

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

10 years ago- Manual: merge modules' directives obsolete compatibilities.
Yann Ylavic [Fri, 4 Apr 2014 13:45:10 +0000 (13:45 +0000)]
- Manual: merge modules' directives obsolete compatibilities.

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

10 years agoMake the manuals' obsolete compatibilities a proposal per se.
Yann Ylavic [Fri, 4 Apr 2014 09:44:12 +0000 (09:44 +0000)]
Make the manuals' obsolete compatibilities a proposal per se.

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

10 years agoAdd manual modifications to SSLOCSPUseRequestNonce proposal and 2.4.x patch.
Yann Ylavic [Fri, 4 Apr 2014 08:33:55 +0000 (08:33 +0000)]
Add manual modifications to SSLOCSPUseRequestNonce proposal and 2.4.x patch.

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

10 years agoPropose mod_expires' fix for PR 55669.
Yann Ylavic [Thu, 3 Apr 2014 22:58:28 +0000 (22:58 +0000)]
Propose mod_expires' fix for PR 55669.

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

10 years agoMove entry already backported to 2.4.8.
Yann Ylavic [Thu, 3 Apr 2014 22:49:04 +0000 (22:49 +0000)]
Move entry already backported to 2.4.8.

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

10 years agovote for reqtimeout i proposed
Eric Covener [Thu, 3 Apr 2014 21:50:37 +0000 (21:50 +0000)]
vote for reqtimeout i proposed
add a -1 for aliasmatch thing

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

10 years agoYea infra!
Jeff Trawick [Thu, 3 Apr 2014 21:27:20 +0000 (21:27 +0000)]
Yea infra!

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

10 years agolet's see if this feature is well aged or just ignored...
Jeff Trawick [Thu, 3 Apr 2014 21:24:05 +0000 (21:24 +0000)]
let's see if this feature is well aged or just ignored...

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

10 years agoAdd manual/CHANGES modifications to SSLOCSPUseRequestNonce proposal.
Yann Ylavic [Wed, 2 Apr 2014 17:28:28 +0000 (17:28 +0000)]
Add manual/CHANGES modifications to SSLOCSPUseRequestNonce proposal.

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