]> granicus.if.org Git - apache/log
apache
10 years agoRebuild.
Lucien Gentis [Sun, 22 Jun 2014 14:03:36 +0000 (14:03 +0000)]
Rebuild.

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

10 years agoXML updates.
Lucien Gentis [Sun, 22 Jun 2014 13:59:49 +0000 (13:59 +0000)]
XML updates.

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

10 years agoAdd some compatibilty notes for some options of "support" applications
Christophe Jaillet [Sun, 22 Jun 2014 05:34:36 +0000 (05:34 +0000)]
Add some compatibilty notes for some options of "support" applications

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

10 years agoVote for r1604350.
Yann Ylavic [Sat, 21 Jun 2014 21:56:34 +0000 (21:56 +0000)]
Vote for r1604350.

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

10 years agoMerge r1604461 from trunk:
Jeff Trawick [Sat, 21 Jun 2014 21:24:32 +0000 (21:24 +0000)]
Merge r1604461 from trunk:

Follow-up to r1601076: Provide documentation for -m option.

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

10 years agosilly typo
Jeff Trawick [Sat, 21 Jun 2014 21:22:35 +0000 (21:22 +0000)]
silly typo

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

10 years agoMerge r1572092 from trunk:
Yann Ylavic [Sat, 21 Jun 2014 21:13:45 +0000 (21:13 +0000)]
Merge r1572092 from trunk:

mod_deflate: fix decompression of files larger than 4GB. According to RFC1952,
Input SIZE (compLen) contains the size of the original input data modulo 2^32.

PR: 56062
Submitted by: Lukas Bezdicka
Reviewed by: jkaluza, ylavic, covener

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

10 years agoMerge r1572655, r1572663, r1572668, r1572669, r1572670, r1572671, r1573224, r1586745...
Yann Ylavic [Sat, 21 Jun 2014 21:07:36 +0000 (21:07 +0000)]
Merge r1572655, r1572663, r1572668, r1572669, r1572670, r1572671, r1573224, r1586745, r1587594, r1587639, r1590509 from trunk.

Commit 1 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Handle Zlib header buffering in the inflate output filter :
- add the new deflate_ctx_t fields needed to re-enter the Zlib header parsing,
- introduce the new consume_zlib_flags() function to parse/consume the ZLib flags (will be used by the other filters too),
- use it to handle incomplete header in the output filter (deflate).

This alone fixes PR 55666, but the issue remains for PR 46146 (inflate/deflate input filters), hence the following patches.

Commit 2 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Handle Zlib header buffering in the inflate input filter :
- loop until all the header is received,
- handle non blocking reads returning empty brigade,
- fix a double ap_get_brigade() when an EOS brigade is encountered while reading the header,
- in that case and no data was received so far, don't return an error but SUCCESS with the EOS, otherwise fail,
- don't remove the Content-Length and Content-MD5 headers until some data is read.

Still does not handle Zlib flags for now, next commits.

Commit 3 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Handle Zlib validation bytes buffering (CRC + length) in the inflate input filter :
- use validation_buffer and validation_length as state,
- loop until all the bytes are received.

Commit 4 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Handle non blocking reads which would block in the inflate input filter (not an error).

Commit 5 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Handle Zlib flags in the inflate input filter as in the output filter, using consume_zlib_flags().

Commit 6 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Ignore empty buckets and split buckets longer than INT_MAX (since zlib uses 32-bit ints only) in all filters.

mod_deflate: when consuming zlibs flags, APR_INCOMPLETE implies no more bytes available.

mod_deflate: update empty log tags.

mod_deflate: Delay INFLATE input filter's self removal until all the buffered
             buckets are out (including EOS). PR 46146.

mod_deflate: Don't return gzip-ed data when reading FLUSH bucket in INFLATE
             input filter, forward the FLUSH but keep reading should EOS/more
             follow (should not happen, but mod_deflate won't fix it).

mod_deflate: follow up to r1587639.
Don't break the looped brigade when moving the FLUSH bucket to the returned bb
and continue reading.

Reviewed by: ylavic, jim, covener

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

10 years agodoc xforms
Jeff Trawick [Sat, 21 Jun 2014 13:57:13 +0000 (13:57 +0000)]
doc xforms

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

10 years agoMerge r1604382 from trunk:
Jeff Trawick [Sat, 21 Jun 2014 13:55:10 +0000 (13:55 +0000)]
Merge r1604382 from trunk:

Follow up r1573626 with some wordsmithing, a compatibility note,
and indentation.

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

10 years agoMerge r1573626 from trunk:
Jeff Trawick [Sat, 21 Jun 2014 13:47:30 +0000 (13:47 +0000)]
Merge r1573626 from trunk:

mod_proxy: Allow reverse-proxy to be set via explicit handler.

Submitted by: ryo takatsuki <ryotakatsuki gmail com>
Reviewed by: ylavic, jim, mrumph

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

10 years agoMerge r1601076 from trunk:
Jeff Trawick [Sat, 21 Jun 2014 13:41:28 +0000 (13:41 +0000)]
Merge r1601076 from trunk:

ab: support custom HTTP method with -m argument.

PR: 56604
Submitted by: Roman Jurkov <winfinit gmail.com>
Reviewed by: ylavic, trawick, covener

(r1601680 and r1601700 not reflected in mergeinfo due to
a collision with an unrelated trunk change)

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

10 years agomerge 1592032 from trunk:
Jeff Trawick [Sat, 21 Jun 2014 13:36:49 +0000 (13:36 +0000)]
merge 1592032 from trunk:

mod_proxy_fcgi: better error messages, and fix an old bug where the error
                condition was forgotten

Submitted by: trawick
Reviewed by: ylavic, covener

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

10 years agopromotions
Eric Covener [Sat, 21 Jun 2014 13:25:10 +0000 (13:25 +0000)]
promotions

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

10 years agovotes and more votes
Eric Covener [Sat, 21 Jun 2014 13:21:56 +0000 (13:21 +0000)]
votes and more votes

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

10 years agopropose another fix unsafe c->sbh = NULL
Eric Covener [Sat, 21 Jun 2014 13:13:10 +0000 (13:13 +0000)]
propose another fix unsafe c->sbh = NULL

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

10 years agomod_lua: Backport disabling of early/late in LuaHookCheckUserID
Daniel Gruno [Sat, 21 Jun 2014 11:21:04 +0000 (11:21 +0000)]
mod_lua: Backport disabling of early/late in LuaHookCheckUserID

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

10 years agomod_lua: Sync 2.4.x with trunk (more or less); Backport a fix and some code harmoniza...
Daniel Gruno [Sat, 21 Jun 2014 11:19:40 +0000 (11:19 +0000)]
mod_lua: Sync 2.4.x with trunk (more or less); Backport a fix and some code harmonization:
- IVM changed to use shm
- More verbose error logging (no functional change)
- Miscellaneous refactoring that was in trunk but not in 2.4.x (no functional change as such)

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

10 years agoTrivial 2.4.x vs trunk synch.
Christophe Jaillet [Fri, 20 Jun 2014 05:45:58 +0000 (05:45 +0000)]
Trivial 2.4.x vs trunk synch.
Stray whitespace (r1602730 in trunk)

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

10 years agoVote on mod_proxy proposal.
Mike Rumph [Thu, 19 Jun 2014 17:27:19 +0000 (17:27 +0000)]
Vote on mod_proxy proposal.

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

10 years agoAdd CHANGES entries to mod_deflate proposals.
Yann Ylavic [Tue, 17 Jun 2014 13:49:48 +0000 (13:49 +0000)]
Add CHANGES entries to mod_deflate proposals.

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

10 years agor1592032 doesn't merge cleanly anymore, so provide a patch
Jeff Trawick [Tue, 17 Jun 2014 12:15:27 +0000 (12:15 +0000)]
r1592032 doesn't merge cleanly anymore, so provide a patch

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

10 years agoMerge r1572905, r1595305, r1597182, r1586827, r1534892, r1563193, r1597639 from trunk:
Jim Jagielski [Tue, 17 Jun 2014 12:06:05 +0000 (12:06 +0000)]
Merge r1572905, r1595305, r1597182, r1586827, r1534892, r1563193, r1597639 from trunk:

core: avoid a double apr_time_now() call on the first succeeding read.

* Correctly escape user provided data.

PR: 56532
Submitted by: Maksymilian <max cert.cx>
Reviewed by: rpluem

Save a few bytes of memory. This can be done in temp_pool.

Fix layout

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)

add the URI to DEBUG message 00765 (and drop an exclamation point):

  Cache provider's store_body failed!

Doxygen fix + reorg to match how other header files are built
Submitted by: ylavic, rpluem, jailletc36, jailletc36, trawick, covener, jailletc36
Reviewed/backported by: jim

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

10 years agoMerge r1603027, r1603029, r1603122 from trunk:
Jim Jagielski [Tue, 17 Jun 2014 12:04:23 +0000 (12:04 +0000)]
Merge r1603027, r1603029, r1603122 from trunk:

Fix bug introduced in r1591508 which resulted in the final empty
FCGI_STDIN not being sent.  Interaction with latest uWSGI (and
probably other protocol implementations) breaks without this.

Reindent after small fix in r1603027

mod_proxy_fcgi: follow up to r1592032.

Also break the outer loop when "sending stdin" fails.

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

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

10 years agopromote
Jim Jagielski [Tue, 17 Jun 2014 12:03:12 +0000 (12:03 +0000)]
promote

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

10 years agovotes
Jim Jagielski [Tue, 17 Jun 2014 12:02:30 +0000 (12:02 +0000)]
votes

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

10 years agoVotes.
Yann Ylavic [Tue, 17 Jun 2014 11:26:16 +0000 (11:26 +0000)]
Votes.

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

10 years agoThanks, Yann!
Jeff Trawick [Tue, 17 Jun 2014 11:12:50 +0000 (11:12 +0000)]
Thanks, Yann!

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

10 years agoNotes about mod_proxy_fcgi fixes.
Yann Ylavic [Tue, 17 Jun 2014 10:41:08 +0000 (10:41 +0000)]
Notes about mod_proxy_fcgi fixes.

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

10 years agoUpdate UDS connect() proposal and vote.
Yann Ylavic [Tue, 17 Jun 2014 10:15:30 +0000 (10:15 +0000)]
Update UDS connect() proposal and vote.

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

10 years agotrawick is being an idiot again.
Jeff Trawick [Tue, 17 Jun 2014 00:09:23 +0000 (00:09 +0000)]
trawick is being an idiot again.

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

10 years agoRebuild html
Rich Bowen [Sun, 15 Jun 2014 20:31:34 +0000 (20:31 +0000)]
Rebuild html

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

10 years agoExample of loading an MPM with LoadModule, and what error you get when
Rich Bowen [Sun, 15 Jun 2014 20:30:37 +0000 (20:30 +0000)]
Example of loading an MPM with LoadModule, and what error you get when
you do it wrong.

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

10 years agorebuild
Rich Bowen [Sun, 15 Jun 2014 20:11:13 +0000 (20:11 +0000)]
rebuild

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

10 years agoMarkup errors.
Rich Bowen [Sun, 15 Jun 2014 20:09:30 +0000 (20:09 +0000)]
Markup errors.

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

10 years ago<page> not valid in this context.
Rich Bowen [Sun, 15 Jun 2014 20:05:49 +0000 (20:05 +0000)]
<page> not valid in this context.

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

10 years agoMore relevant links in the getting started doc.
Rich Bowen [Sun, 15 Jun 2014 20:04:05 +0000 (20:04 +0000)]
More relevant links in the getting started doc.

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

10 years agoBuild HTML
Rich Bowen [Sun, 15 Jun 2014 15:23:50 +0000 (15:23 +0000)]
Build HTML

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

10 years agoRemove ancient IE-on-Mac example.
Rich Bowen [Sun, 15 Jun 2014 15:21:53 +0000 (15:21 +0000)]
Remove ancient IE-on-Mac example.

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

10 years agoRebuild.
Lucien Gentis [Sun, 15 Jun 2014 13:12:01 +0000 (13:12 +0000)]
Rebuild.

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

10 years agoXML updates.
Lucien Gentis [Sun, 15 Jun 2014 13:11:01 +0000 (13:11 +0000)]
XML updates.

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

10 years agoRebuil.
Lucien Gentis [Sat, 14 Jun 2014 16:52:30 +0000 (16:52 +0000)]
Rebuil.

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

10 years agoXML updates.
Lucien Gentis [Sat, 14 Jun 2014 16:51:06 +0000 (16:51 +0000)]
XML updates.

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

10 years agoupdate transformations
Takashi Sato [Fri, 13 Jun 2014 00:59:33 +0000 (00:59 +0000)]
update transformations

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

10 years agoupdate Japanese translation
Takashi Sato [Fri, 13 Jun 2014 00:42:37 +0000 (00:42 +0000)]
update Japanese translation
(simply copy from trunk except revision ref)

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

10 years agoupdate Japanese translation
Takashi Sato [Thu, 12 Jun 2014 12:09:03 +0000 (12:09 +0000)]
update Japanese translation

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

10 years agovote+note
Jeff Trawick [Wed, 11 Jun 2014 19:35:54 +0000 (19:35 +0000)]
vote+note

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

10 years agobetter mod_proxy_fcgi error messages perhaps?
Jeff Trawick [Tue, 10 Jun 2014 19:25:21 +0000 (19:25 +0000)]
better mod_proxy_fcgi error messages perhaps?

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

10 years agomerge r1591508 from trunk:
Jeff Trawick [Tue, 10 Jun 2014 19:18:55 +0000 (19:18 +0000)]
merge r1591508 from trunk:

mod_proxy_fcgi: Support iobuffersize parameter.

Submitted by: trawick
Reviewed by: jim, ylavic

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

10 years agoFix ab (custom method) proposal.
Yann Ylavic [Tue, 10 Jun 2014 17:45:57 +0000 (17:45 +0000)]
Fix ab (custom method) proposal.

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

10 years agoPropose SSL shutdown fixes on both ends (client/backend).
Yann Ylavic [Tue, 10 Jun 2014 17:30:04 +0000 (17:30 +0000)]
Propose SSL shutdown fixes on both ends (client/backend).

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

10 years agoVote, promote.
Yann Ylavic [Tue, 10 Jun 2014 16:27:36 +0000 (16:27 +0000)]
Vote, promote.

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

10 years agoProposals
Christophe Jaillet [Tue, 10 Jun 2014 05:36:52 +0000 (05:36 +0000)]
Proposals

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

10 years agoMerge r1601532 from trunk:
Eric Covener [Tue, 10 Jun 2014 00:02:39 +0000 (00:02 +0000)]
Merge r1601532 from trunk:

simplify/clarify that negation operates on an entire condition and not
on the regex or the special test conditions. Comment #1291.

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

10 years agor1599852 and r1599799 in trunk
Christophe Jaillet [Mon, 9 Jun 2014 06:22:01 +0000 (06:22 +0000)]
r1599852 and r1599799 in trunk
Fix broken URL in comment

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

10 years agor1553485.
Christophe Jaillet [Mon, 9 Jun 2014 05:57:43 +0000 (05:57 +0000)]
r1553485.
Comment fix

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

10 years agogenerated changes
Mike Rumph [Thu, 5 Jun 2014 00:26:44 +0000 (00:26 +0000)]
generated changes

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

10 years agoFix spelling and grammar errors
Mike Rumph [Thu, 5 Jun 2014 00:01:22 +0000 (00:01 +0000)]
Fix spelling and grammar errors

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

10 years agogenerated changes
Mike Rumph [Wed, 4 Jun 2014 18:05:01 +0000 (18:05 +0000)]
generated changes

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

10 years agoRemove redundant paragraph and fix grammar errors.
Mike Rumph [Wed, 4 Jun 2014 18:02:10 +0000 (18:02 +0000)]
Remove redundant paragraph and fix grammar errors.

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

10 years agogenerated changes
Mike Rumph [Wed, 4 Jun 2014 17:52:45 +0000 (17:52 +0000)]
generated changes

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

10 years agoFix spelling and grammar errors.
Mike Rumph [Wed, 4 Jun 2014 00:54:08 +0000 (00:54 +0000)]
Fix spelling and grammar errors.

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

10 years agoGenerated doc files.
Mike Rumph [Wed, 4 Jun 2014 00:39:06 +0000 (00:39 +0000)]
Generated doc files.

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

10 years agoFix r1593664 where I miss read the code and what is performed in "header_inout_cmd...
Christophe Jaillet [Tue, 3 Jun 2014 20:44:50 +0000 (20:44 +0000)]
Fix r1593664 where I miss read the code and what is performed in "header_inout_cmd()" where arguments are "shuffled" according to the "action" to be performed.

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

10 years agoNew mod_proxy proposals.
Yann Ylavic [Tue, 3 Jun 2014 15:12:50 +0000 (15:12 +0000)]
New mod_proxy proposals.

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

10 years agoAdd some missing changes.
Yann Ylavic [Tue, 3 Jun 2014 15:09:37 +0000 (15:09 +0000)]
Add some missing changes.

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

10 years agoHmmm... wasn't added w/ the patch :/
Jim Jagielski [Tue, 3 Jun 2014 12:54:00 +0000 (12:54 +0000)]
Hmmm... wasn't added w/ the patch :/

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

10 years agoMerge r1546730, r1583008, r1571369, r1552130, r1578760, r1592615, r1592632, r1595321...
Jim Jagielski [Tue, 3 Jun 2014 12:14:22 +0000 (12:14 +0000)]
Merge r1546730, r1583008, r1571369, r1552130, r1578760, r1592615, r1592632, r1595321, r1550302, r1550307, r1585435 from trunk:

fix whitespace in a debug message

s/comment/self-documenting/

normalize an ugly construct which somehow manages to return the correct value

This is annoying to see in a casual "LogLevel debug foo:traceX ..."

Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory.

Follow-up to r1592529:

Define default port for "scgi" schemes (as chosen by
mod_proxy_scgi) in a common location.

Suggested by: jailletc36

fix Doxygen markup error

Submitted by: jailletc36

Tweak a AP_DEBUG_ASSERT condition.
Valid index to use 'req_header_var_names' are 0...6

mod_auth_form: Add a debug message when the fields on a form are not
recognised.

mod_auth_form: Make the trace logging consistent through the notes, session
and form authentication steps.

mod_auth_form: update empty log tags.
Submitted by: trawick, covener, jailletc36, trawick, trawick, jailletc36, minfrin, minfrin, ylavic
Reviewed/backported by: jim

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

10 years agoPropose r1599486.
Yann Ylavic [Tue, 3 Jun 2014 12:07:41 +0000 (12:07 +0000)]
Propose r1599486.

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

10 years agoPromote.
Yann Ylavic [Tue, 3 Jun 2014 11:44:59 +0000 (11:44 +0000)]
Promote.

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

10 years agoFix layout in previous commit
Christophe Jaillet [Sun, 1 Jun 2014 17:33:17 +0000 (17:33 +0000)]
Fix layout in previous commit

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

10 years agoAcceptFilter has two parameters + syntax highlight
Christophe Jaillet [Sun, 1 Jun 2014 17:31:11 +0000 (17:31 +0000)]
AcceptFilter has two parameters + syntax highlight
See r1397602 on trunk

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

10 years agoRebuild.
Lucien Gentis [Sat, 31 May 2014 14:30:18 +0000 (14:30 +0000)]
Rebuild.

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

10 years agoXML Updates.
Lucien Gentis [Sat, 31 May 2014 14:28:56 +0000 (14:28 +0000)]
XML Updates.

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

10 years agoMerge r1592511, r1592514 from trunk:
Jim Jagielski [Fri, 30 May 2014 13:51:39 +0000 (13:51 +0000)]
Merge r1592511, r1592514 from trunk:

reformat only (get rid of unnecessary block scope)

Clarify an existing requirement of the server_portstr parameter
to ap_proxy_determine_connection(): it must be a buffer of at
least one byte in size.

(And don't bother with using strcpy in order to zap a string.)

Submitted by: trawick
Reviewed/backported by: jim

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

10 years agoMerge r1591328, r1594643, r1594648 from trunk:
Jim Jagielski [Fri, 30 May 2014 13:50:37 +0000 (13:50 +0000)]
Merge r1591328, r1594643, r1594648 from trunk:

mod_cache: Preserve non-cacheable headers forwarded from an origin 304
           response. PR 55547.

When mod_cache asks for a revalidation of a stale entry and the origin responds
with a 304 (not that stale), the module strips the non-cacheable headers from
the origin response and merges the stale headers to update the cache.

The problem is that mod_cache won't forward the non-cacheable headers to the
client, for example if the 304 response contains both Set-Cookie and
'Cache-Control: no-cache="Set-Cookie"' headers, or CacheIgnoreHeaders is used.

mod_cache: follow up to r1591328.

Define the cache_merge_headers_out() function to merge r->err_headers_out into
r->headers_out and add the ones from r->content_type/encoding if available.
Use it in ap_cache_cacheable_headers_out() where the same is done and in
cache_save_filter() where this has to be done before updating the entry.

mod_cache: follow up to r1594643.

Avoid table lookup if not necessary (fast path first).

Submitted by: ylavic
Reviewed/backported by: jim

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

10 years agoMerge r1594625 from trunk:
Jim Jagielski [Fri, 30 May 2014 13:49:29 +0000 (13:49 +0000)]
Merge r1594625 from trunk:

mod_proxy_wstunnel: Fix the use of SSL connections with the "wss:" scheme.
                    PR55320.

Submitted by: Alex Liu <alex.leo.ca gmail.com>
Committed by: ylavic

Submitted by: ylavic
Reviewed/backported by: jim

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

10 years agoxforms
Jim Jagielski [Fri, 30 May 2014 13:48:02 +0000 (13:48 +0000)]
xforms

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

10 years agopromote (more this weekend)
Jim Jagielski [Fri, 30 May 2014 13:44:41 +0000 (13:44 +0000)]
promote (more this weekend)

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

10 years agovotes
Jim Jagielski [Fri, 30 May 2014 13:44:00 +0000 (13:44 +0000)]
votes

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

10 years agoupdate Japanese translation
Takashi Sato [Fri, 30 May 2014 11:52:54 +0000 (11:52 +0000)]
update Japanese translation
(simply copy from trunk except revision ref)

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

10 years agoRebuild.
Lucien Gentis [Thu, 29 May 2014 18:42:06 +0000 (18:42 +0000)]
Rebuild.

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

10 years agoXML Update.
Lucien Gentis [Thu, 29 May 2014 18:41:28 +0000 (18:41 +0000)]
XML Update.

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

10 years agoRebuild.
Lucien Gentis [Thu, 29 May 2014 14:10:10 +0000 (14:10 +0000)]
Rebuild.

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

10 years agoXML updates.
Lucien Gentis [Thu, 29 May 2014 14:08:29 +0000 (14:08 +0000)]
XML updates.

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

10 years agoMerge r1560683 and r1581011 from trunk:
Takashi Sato [Thu, 29 May 2014 12:55:59 +0000 (12:55 +0000)]
Merge r1560683 and r1581011 from trunk:

(mod/mod_proxy_express.xml)
It does more than just a ProxyPass, but also looks at the HOST header,
so this gives somewhat deeper insight into what the end result looks
like.

(mod/mod_proxy_connect.xml)
a comma leaked onto the page

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

10 years agoVote for mod_deflate patch.
Jan Kaluža [Thu, 29 May 2014 08:01:31 +0000 (08:01 +0000)]
Vote for mod_deflate patch.

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

10 years agoFix typo spotted on online doc by Louise Hope.
Christophe Jaillet [Wed, 28 May 2014 20:50:12 +0000 (20:50 +0000)]
Fix typo spotted on online doc by Louise Hope.
#comment_2558

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

10 years agoxforms
Eric Covener [Wed, 28 May 2014 20:14:36 +0000 (20:14 +0000)]
xforms

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

10 years agocomment #2562 -- copy/paste error in CacheSocache. Already correct on trunk.
Eric Covener [Wed, 28 May 2014 20:13:38 +0000 (20:13 +0000)]
comment #2562 -- copy/paste error in CacheSocache.  Already correct on trunk.

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

10 years agoMerge r1598088 from trunk:
Eric Covener [Wed, 28 May 2014 18:02:36 +0000 (18:02 +0000)]
Merge r1598088 from trunk:

fix typo -- comment 2561

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

10 years agothie file is not outdated.
André Malo [Mon, 26 May 2014 07:50:42 +0000 (07:50 +0000)]
thie file is not outdated.

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

10 years agoHTML build.
Lucien Gentis [Sat, 24 May 2014 14:31:10 +0000 (14:31 +0000)]
HTML build.

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

10 years agoXML Updates.
Lucien Gentis [Sat, 24 May 2014 14:25:53 +0000 (14:25 +0000)]
XML Updates.

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

10 years agoupdate transformations
Takashi Sato [Fri, 23 May 2014 21:37:10 +0000 (21:37 +0000)]
update transformations

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

10 years agoupdate Japanese translation update Japanese translations
Takashi Sato [Fri, 23 May 2014 21:17:39 +0000 (21:17 +0000)]
update Japanese translation update Japanese translations
(simply copy from trunk except revision ref)

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

10 years agoMerge r1517551, r1517588 and r1517589 from trunk
Takashi Sato [Fri, 23 May 2014 20:50:17 +0000 (20:50 +0000)]
Merge r1517551, r1517588 and r1517589 from trunk

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

10 years agoupdate Japanese translations
Takashi Sato [Fri, 23 May 2014 20:25:43 +0000 (20:25 +0000)]
update Japanese translations

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

10 years agoupdate Japanese translations
Takashi Sato [Fri, 23 May 2014 19:50:28 +0000 (19:50 +0000)]
update Japanese translations
(simply copy from trunk except revision ref)

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

10 years agoMerge r1516872, 1542353 and 1580895 from trunk:
Takashi Sato [Fri, 23 May 2014 12:47:50 +0000 (12:47 +0000)]
Merge r1516872, 1542353 and 1580895 from trunk:
  howto/index.xml:
    CGI is no longer the most common way to provide dynamic content, is it?
  howto/access.xml:
    Suggest the 'require expr' syntax as an alternate way to do something.
  caching.xml:
    elaborate on the early/late vs "Authorization" header (vs. other forms of
    authorization)

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