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 [Mon, 24 Jun 2013 18:14:30 +0000 (18:14 +0000)]

Merge r1492663 from trunk:

mod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged
correctly.

Submitted by: minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

André Malo [Sun, 23 Jun 2013 18:08:42 +0000 (18:08 +0000)]

update transformation

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

commit | commitdiff | tree

Eric Covener [Sun, 23 Jun 2013 16:57:55 +0000 (16:57 +0000)]

mention addoutputfilterbytype moving to mod_filter

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

commit | commitdiff | tree

Christophe Jaillet [Sun, 23 Jun 2013 05:44:00 +0000 (05:44 +0000)]

Fix typo (trunk r1491610)

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

commit | commitdiff | tree

Lucien Gentis [Sat, 22 Jun 2013 16:47:04 +0000 (16:47 +0000)]

Updates.

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

commit | commitdiff | tree

Christophe Jaillet [Sat, 22 Jun 2013 05:01:27 +0000 (05:01 +0000)]

Vote + promote

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

commit | commitdiff | tree

André Malo [Fri, 21 Jun 2013 20:41:43 +0000 (20:41 +0000)]

svn:eol-style = native

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

commit | commitdiff | tree

André Malo [Fri, 21 Jun 2013 20:02:24 +0000 (20:02 +0000)]

update transformation

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

commit | commitdiff | tree

André Malo [Fri, 21 Jun 2013 19:57:43 +0000 (19:57 +0000)]

fix properties.

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

commit | commitdiff | tree

Jeff Trawick [Fri, 21 Jun 2013 16:47:34 +0000 (16:47 +0000)]

merge r1495501 from trunk:

fix doc for ap_pregsub_ex() return code

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

commit | commitdiff | tree

Jeff Trawick [Thu, 20 Jun 2013 21:35:50 +0000 (21:35 +0000)]

fix strange wording

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

commit | commitdiff | tree

Eric Covener [Thu, 20 Jun 2013 12:31:24 +0000 (12:31 +0000)]

Merge r1494952 from trunk:

Document apxs -p paramter.

Submitted by: Jan Kaluža <jkaluza@redhat.com>
Reviewed by: covener

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

commit | commitdiff | tree

Graham Leggett [Wed, 19 Jun 2013 13:41:34 +0000 (13:41 +0000)]

Add a comment.

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

commit | commitdiff | tree

Rainer Jung [Wed, 19 Jun 2013 12:55:56 +0000 (12:55 +0000)]

mod_cache_socache: Fix warning "variable 'rv' may
be used uninitialized in this function"
(which is correct here).

Backport of r1494536 form trunk.

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

commit | commitdiff | tree

Guenter Knauf [Wed, 19 Jun 2013 11:53:23 +0000 (11:53 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Guenter Knauf [Wed, 19 Jun 2013 11:52:25 +0000 (11:52 +0000)]

Applied.

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

commit | commitdiff | tree

Guenter Knauf [Wed, 19 Jun 2013 11:51:57 +0000 (11:51 +0000)]

sync with trunk to silent compiler warnings.
Backport of r1481677, r1494317, r1488496.
Reviewed by: fuankg, gsmith, minfrin

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

commit | commitdiff | tree

Graham Leggett [Wed, 19 Jun 2013 11:42:06 +0000 (11:42 +0000)]

Promote.

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

commit | commitdiff | tree

Graham Leggett [Wed, 19 Jun 2013 11:39:49 +0000 (11:39 +0000)]

Vote.

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

commit | commitdiff | tree

Graham Leggett [Wed, 19 Jun 2013 11:31:09 +0000 (11:31 +0000)]

Vote.

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

commit | commitdiff | tree

Rainer Jung [Wed, 19 Jun 2013 10:29:37 +0000 (10:29 +0000)]

Propose.

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

commit | commitdiff | tree

Gregg Lewis Smith [Wed, 19 Jun 2013 06:31:51 +0000 (06:31 +0000)]

vote

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

commit | commitdiff | tree

Guenter Knauf [Wed, 19 Jun 2013 00:34:36 +0000 (00:34 +0000)]

propose.

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

commit | commitdiff | tree

Stefan Fritsch [Tue, 18 Jun 2013 20:03:41 +0000 (20:03 +0000)]

comment

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

commit | commitdiff | tree

Jim Jagielski [Tue, 18 Jun 2013 12:55:28 +0000 (12:55 +0000)]

vote

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

commit | commitdiff | tree

Jim Jagielski [Tue, 18 Jun 2013 12:54:49 +0000 (12:54 +0000)]

sf doesn't like this so it won't be backported...
Oh well. Who sez useful stuff should be included?

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

commit | commitdiff | tree

Jim Jagielski [Tue, 18 Jun 2013 12:50:05 +0000 (12:50 +0000)]

Merge r1491155 from trunk:

Allow use of strtoul()

It conforms to C89 and we don't support older compilers than that.

PR: 55077

Submitted by: sf
Reviewed/backported by: jim

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

commit | commitdiff | tree

Rainer Jung [Mon, 17 Jun 2013 21:15:07 +0000 (21:15 +0000)]

Update transformations.

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

commit | commitdiff | tree

Rainer Jung [Mon, 17 Jun 2013 21:00:23 +0000 (21:00 +0000)]

Added new funtions to mod_lua docu.

Backport of r1492782 from trunk.

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

commit | commitdiff | tree

Graham Leggett [Mon, 17 Jun 2013 20:38:31 +0000 (20:38 +0000)]

Propose.

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 16 Jun 2013 21:34:41 +0000 (21:34 +0000)]

comment

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

commit | commitdiff | tree

Eric Covener [Fri, 14 Jun 2013 21:53:13 +0000 (21:53 +0000)]

vote on an easy one-liner

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

commit | commitdiff | tree

Jeff Trawick [Fri, 14 Jun 2013 21:41:12 +0000 (21:41 +0000)]

vote/promote de-kludgification of strtoul

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

commit | commitdiff | tree

Stefan Fritsch [Fri, 14 Jun 2013 21:07:19 +0000 (21:07 +0000)]

update strtoul proposal to include a minor MMN bump. Keep jim's conditional
vote

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

commit | commitdiff | tree

Jim Jagielski [Fri, 14 Jun 2013 17:37:51 +0000 (17:37 +0000)]

+1 if we bump

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

commit | commitdiff | tree

Guenter Knauf [Thu, 13 Jun 2013 22:17:21 +0000 (22:17 +0000)]

Added missing export symbols to mod_proxy NetWare makefile.
Submitted by: normw gknw net.

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

commit | commitdiff | tree

Ruediger Pluem [Thu, 13 Jun 2013 18:41:54 +0000 (18:41 +0000)]

* Comment

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

commit | commitdiff | tree

Jim Jagielski [Thu, 13 Jun 2013 16:00:30 +0000 (16:00 +0000)]

better descript

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

commit | commitdiff | tree

Jim Jagielski [Thu, 13 Jun 2013 15:48:19 +0000 (15:48 +0000)]

xforms

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

commit | commitdiff | tree

Jim Jagielski [Thu, 13 Jun 2013 15:45:18 +0000 (15:45 +0000)]

manual (docs are ctr)

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

commit | commitdiff | tree

Jim Jagielski [Thu, 13 Jun 2013 15:33:13 +0000 (15:33 +0000)]

Merge r1490493, r1490761 from trunk:

rotatelogs: add -n number-of-files option to roate through a number
of fixed-name logfiles.

don't truncate the very first file opened (unless the truncate flag is there too)

Submitted by: covener
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Thu, 13 Jun 2013 15:31:55 +0000 (15:31 +0000)]

Agreed... this *does* change the "api"

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

commit | commitdiff | tree

Jim Jagielski [Thu, 13 Jun 2013 15:30:01 +0000 (15:30 +0000)]

other possible backports

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

commit | commitdiff | tree

Jim Jagielski [Thu, 13 Jun 2013 15:19:31 +0000 (15:19 +0000)]

Bring proxy and core up to sync

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

commit | commitdiff | tree

Jim Jagielski [Thu, 13 Jun 2013 15:09:31 +0000 (15:09 +0000)]

Merge r1452911, r1452949, r1452954, r1453022, r1453574, r1453875, r1453876, r1453963, r1454386, r1454414, r1454415, r1458285, r1458447 from trunk:

Rough start for simple, tunneling websocket proxy support.
Compiles at this stage and that's all I know :)

force correct scheme info

We need to ensure a conn_rec

Work around blocking issues...

And now pass the initial request to the backend...

I dislike this duplication of code from mod_proxy_http()
but maybe it's inevitable. I may create ap_proxy_create_headerb()
to create a header brigade that both modules can use.

Pull out duplicated code to proxy_util...

rename extension module... tunnel is more accurate

log nums

"final" rename :)

don't strip these, ensure that they exist.

streamline

bypass reqtimeout for websockets

Keep mod_req clear. Simply scan thru input filters and
remove it within the ws submodule. Nasty, but it keeps
mod_req untouched (for now ;) )
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Thu, 13 Jun 2013 14:47:37 +0000 (14:47 +0000)]

vote+promote

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

commit | commitdiff | tree

Graham Leggett [Thu, 13 Jun 2013 13:20:11 +0000 (13:20 +0000)]

Propose.

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

commit | commitdiff | tree

Gregg Lewis Smith [Wed, 12 Jun 2013 17:50:46 +0000 (17:50 +0000)]

Note on wstunnel

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

commit | commitdiff | tree

Guenter Knauf [Wed, 12 Jun 2013 17:29:34 +0000 (17:29 +0000)]

Mention new mod_lua functions.

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

commit | commitdiff | tree

André Malo [Wed, 12 Jun 2013 15:35:32 +0000 (15:35 +0000)]

update transformation

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

commit | commitdiff | tree

Jim Jagielski [Wed, 12 Jun 2013 13:41:09 +0000 (13:41 +0000)]

Merge r1491458 from trunk:

mod_cache_socache: Use the name of the socache implementation when performing
a lookup rather than using the raw arguments.

Submitted by: minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Wed, 12 Jun 2013 13:39:56 +0000 (13:39 +0000)]

Merge r1491221, r1491479, r1491538 from trunk:

Reduce stack usage, 32 bytes are enough here, no need to take 8k in the stack. (19 would be enough, but be safe...)

Use the size of the buffer as opposed to MAX_STRING_LEN.

Reduce stack usage, 32 bytes are enough here, no need to
take 8k in the stack. (19 would be enough, but be safe...)
Use the size of the buffer as opposed to MAX_STRING_LEN.

Followup to r1491221+r1491479: change consistently
the same code used in another place in the same file.

Submitted by: jailletc36, minfrin, rjung
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Wed, 12 Jun 2013 13:38:57 +0000 (13:38 +0000)]

promote

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

commit | commitdiff | tree

Jim Jagielski [Wed, 12 Jun 2013 13:38:19 +0000 (13:38 +0000)]

vote

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

commit | commitdiff | tree

Gregg Lewis Smith [Tue, 11 Jun 2013 19:36:59 +0000 (19:36 +0000)]

mod_lua: Fully sync 2.4.x with trunk (catch up to r1490700).
backport r1439027
Expand mod_lua stack size to fit image and readdress the remaining modules

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

commit | commitdiff | tree

Guenter Knauf [Tue, 11 Jun 2013 19:18:33 +0000 (19:18 +0000)]

mod_lua: Fully sync 2.4.x with trunk (catch up to r1490700).
Added missing files from commit r1491468.

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

commit | commitdiff | tree

Stefan Fritsch [Mon, 10 Jun 2013 21:41:07 +0000 (21:41 +0000)]

comment

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

commit | commitdiff | tree

Rainer Jung [Mon, 10 Jun 2013 20:02:59 +0000 (20:02 +0000)]

Vote.

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

commit | commitdiff | tree

Christophe Jaillet [Mon, 10 Jun 2013 19:08:24 +0000 (19:08 +0000)]

Update proposal

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

commit | commitdiff | tree

Rainer Jung [Mon, 10 Jun 2013 17:50:45 +0000 (17:50 +0000)]

Add to existing proposal.

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

commit | commitdiff | tree

Graham Leggett [Mon, 10 Jun 2013 15:12:01 +0000 (15:12 +0000)]

Vote.

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

commit | commitdiff | tree

Graham Leggett [Mon, 10 Jun 2013 14:51:13 +0000 (14:51 +0000)]

Comment.

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

commit | commitdiff | tree

Graham Leggett [Mon, 10 Jun 2013 14:46:37 +0000 (14:46 +0000)]

core: Add dirwalk_stat hook.

trunk patch: http://svn.apache.org/r1388447
Submitted by: trawick
Reviewed by: minfrin, jim, sf

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

commit | commitdiff | tree

Graham Leggett [Mon, 10 Jun 2013 14:41:34 +0000 (14:41 +0000)]

core: Add post_perdir_config hook.

trunk patch: http://svn.apache.org/r1368121
Submitted by: minfrin
Reviewed by: jim, sf

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

commit | commitdiff | tree

Graham Leggett [Mon, 10 Jun 2013 14:36:56 +0000 (14:36 +0000)]

mod_lua: Fully sync 2.4.x with trunk (catch up to r1490700):

2.4.x patch: http://www.humbedooh.com/mod_lua_2013_06_07.patch
Submitted by: humbedooh
Reviewed by: fuankg, minfrin

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

commit | commitdiff | tree

Graham Leggett [Mon, 10 Jun 2013 14:34:59 +0000 (14:34 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Graham Leggett [Mon, 10 Jun 2013 14:28:08 +0000 (14:28 +0000)]

proxy_util: NULL terminate the right buffer in 'send_http_connect'

trunk patch: http://svn.apache.org/r1490994
Submitted by: jailletc36
Reviewed by: covener, minfrin

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

commit | commitdiff | tree

Graham Leggett [Mon, 10 Jun 2013 14:26:32 +0000 (14:26 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Graham Leggett [Mon, 10 Jun 2013 14:24:33 +0000 (14:24 +0000)]

mod_remoteip: close file in error path

trunk patch: http://svn.apache.org/r1491234
Submitted by: jailletc36
Reviewed by: covener, minfrin

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

commit | commitdiff | tree

Graham Leggett [Mon, 10 Jun 2013 14:22:57 +0000 (14:22 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Graham Leggett [Mon, 10 Jun 2013 14:12:03 +0000 (14:12 +0000)]

Propose.

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

commit | commitdiff | tree

André Malo [Mon, 10 Jun 2013 07:09:26 +0000 (07:09 +0000)]

vote.

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

commit | commitdiff | tree

Eric Covener [Mon, 10 Jun 2013 00:43:55 +0000 (00:43 +0000)]

vote

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

commit | commitdiff | tree

Eric Covener [Mon, 10 Jun 2013 00:40:06 +0000 (00:40 +0000)]

Merge r1490446 from trunk:

PR55069 include line number in 'AH00113: cannot use a full URL in a 401 ErrorDocument'

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

commit | commitdiff | tree

Christophe Jaillet [Sun, 9 Jun 2013 17:45:37 +0000 (17:45 +0000)]

Propose

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 9 Jun 2013 10:00:04 +0000 (10:00 +0000)]

vote, promote

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 9 Jun 2013 08:22:13 +0000 (08:22 +0000)]

propose

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

commit | commitdiff | tree

Lucien Gentis [Sat, 8 Jun 2013 15:39:48 +0000 (15:39 +0000)]

Updates.

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

commit | commitdiff | tree

Rich Bowen [Fri, 7 Jun 2013 18:22:08 +0000 (18:22 +0000)]

Typo

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

commit | commitdiff | tree

Rich Bowen [Fri, 7 Jun 2013 18:21:28 +0000 (18:21 +0000)]

typo

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

commit | commitdiff | tree

Eric Covener [Fri, 7 Jun 2013 18:12:59 +0000 (18:12 +0000)]

add a rev and reset vote

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

commit | commitdiff | tree

Guenter Knauf [Fri, 7 Jun 2013 16:42:45 +0000 (16:42 +0000)]

promote.

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

commit | commitdiff | tree

Guenter Knauf [Fri, 7 Jun 2013 16:38:35 +0000 (16:38 +0000)]

vote.

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

commit | commitdiff | tree

Daniel Gruno [Fri, 7 Jun 2013 16:16:42 +0000 (16:16 +0000)]

Propose

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

commit | commitdiff | tree

Daniel Gruno [Fri, 7 Jun 2013 13:35:38 +0000 (13:35 +0000)]

Minor typo fix

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

commit | commitdiff | tree

Eric Covener [Fri, 7 Jun 2013 13:20:30 +0000 (13:20 +0000)]

Merge r1490630 from trunk:

speling, pointed out by sluggr on freenode.

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

commit | commitdiff | tree

Jim Jagielski [Fri, 7 Jun 2013 13:02:06 +0000 (13:02 +0000)]

ivote

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

commit | commitdiff | tree

Graham Leggett [Fri, 7 Jun 2013 11:51:28 +0000 (11:51 +0000)]

mod_lua: Sync 2.4 branch with trunk. This includes (but is not limited to)
Server pools, new apr functions for the request_rec table, input/output filters,
LuaCodeCache, LuaMapHandler and multipart form data handling. This is long
overdue, and has become too spaghetti-ish to propose in chunks :|

trunk patch: http://svn.apache.org/r1366890
             http://svn.apache.org/r1367025
             http://svn.apache.org/r1367040
             http://svn.apache.org/r1367048
             http://svn.apache.org/r1383024
             http://svn.apache.org/r1383028
             http://svn.apache.org/r1383037
             http://svn.apache.org/r1367725
             http://svn.apache.org/r1367875
             http://svn.apache.org/r1368109
             http://svn.apache.org/r1369656
             http://svn.apache.org/r1369793
             http://svn.apache.org/r1369800
             http://svn.apache.org/r1370158
             http://svn.apache.org/r1433967
             http://svn.apache.org/r1429169
             http://svn.apache.org/r1425450
             http://svn.apache.org/r1425243
             http://svn.apache.org/r1422552
             http://svn.apache.org/r1422548
             http://svn.apache.org/r1422531
             http://svn.apache.org/r1422373
             http://svn.apache.org/r1422072
             http://svn.apache.org/r1421784
             http://svn.apache.org/r1421780
             (the list goes on...)
    2.4.x patch: http://www.humbedooh.com/mod_lua_sync.patch (+CHANGES)

Submitted by: humbedooh
Reviewed by: jim, covener, fuankg

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

commit | commitdiff | tree

Graham Leggett [Fri, 7 Jun 2013 11:36:15 +0000 (11:36 +0000)]

core: make the "default" parameter of the "ErrorDocument" option case insensitive.
PR 54419

trunk patch: http://svn.apache.org/r1465190
Submitted by: Tianyin Xu <tixu cs ucsd edu>
Reviewed by: jailletc36, fuankg, minfrin

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

commit | commitdiff | tree

Graham Leggett [Fri, 7 Jun 2013 11:29:07 +0000 (11:29 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Graham Leggett [Fri, 7 Jun 2013 11:20:06 +0000 (11:20 +0000)]

mod_proxy_html: make the "ProxyHTMLFixups" options case insensitive.
PR 54420

trunk patch: http://svn.apache.org/r1464762
Submitted by: Tianyin Xu <tixu cs ucsd edu>
Reviewed by: jailletc36, fuankg, minfrin

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

commit | commitdiff | tree

Graham Leggett [Fri, 7 Jun 2013 11:15:46 +0000 (11:15 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Graham Leggett [Fri, 7 Jun 2013 10:56:02 +0000 (10:56 +0000)]

mod_cache: Make option "CacheDisable" in mod_cache case insensitive PR 54462

trunk patch: http://svn.apache.org/r1464721
Submitted by: Tianyin Xu <tixu cs ucsd edu>
Reviewed by: jailletc36, fuankg, minfrin

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

commit | commitdiff | tree

Graham Leggett [Fri, 7 Jun 2013 10:51:59 +0000 (10:51 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Graham Leggett [Fri, 7 Jun 2013 10:09:44 +0000 (10:09 +0000)]

support: Do not use free for memory allocated in a pool (regression introduced in r1476674)

trunk patch: http://svn.apache.org/r1490507
Submitted by: jailletc36
Reviewed by: fuankg, minfrin

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

commit | commitdiff | tree

Graham Leggett [Fri, 7 Jun 2013 10:04:32 +0000 (10:04 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Guenter Knauf [Fri, 7 Jun 2013 08:51:10 +0000 (08:51 +0000)]

Fixed wording.

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

commit | commitdiff | tree

Guenter Knauf [Fri, 7 Jun 2013 08:46:22 +0000 (08:46 +0000)]

vote.

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 7 Jun 2013 05:26:08 +0000 (05:26 +0000)]

Propose

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 7 Jun 2013 05:14:23 +0000 (05:14 +0000)]

backport fix of a comment used by doxygen (was part of r1086071)

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

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