granicus.if.org Git - apache/log

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

Stefan Fritsch [Sat, 6 Jul 2013 21:49:34 +0000 (21:49 +0000)]

Merge r1500323:
add note when default algorithm has been changed

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

commit | commitdiff | tree

Lucien Gentis [Sat, 6 Jul 2013 15:38:16 +0000 (15:38 +0000)]

Updates.

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

commit | commitdiff | tree

Lucien Gentis [Sat, 6 Jul 2013 14:33:14 +0000 (14:33 +0000)]

Upsdate.

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

commit | commitdiff | tree

Eric Covener [Fri, 5 Jul 2013 15:29:41 +0000 (15:29 +0000)]

xform

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

commit | commitdiff | tree

Eric Covener [Fri, 5 Jul 2013 15:28:18 +0000 (15:28 +0000)]

Merge r1500042 from trunk:

address comment http://httpd.apache.org/docs/2.4/vhosts/examples.html#comment_1441 by
explicitly mentioning that ServerName may be calculated and inherited.

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

commit | commitdiff | tree

Eric Covener [Thu, 4 Jul 2013 22:04:57 +0000 (22:04 +0000)]

xform

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

commit | commitdiff | tree

Eric Covener [Thu, 4 Jul 2013 22:04:28 +0000 (22:04 +0000)]

add compatibility info for SSLProxyCheckPeerName

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

commit | commitdiff | tree

Eric Covener [Thu, 4 Jul 2013 22:02:09 +0000 (22:02 +0000)]

add the directive name to the changes entry for SSLProxyCheckPeerName

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

commit | commitdiff | tree

Guenter Knauf [Thu, 4 Jul 2013 20:18:00 +0000 (20:18 +0000)]

Applied.

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

commit | commitdiff | tree

Guenter Knauf [Thu, 4 Jul 2013 20:17:22 +0000 (20:17 +0000)]

Avoid including apr_general.h.
The MSVC Resource Compiler truncates macro names at char 31.
Since apr_general.h includes apr.h which in turn includes
system headers we get warnings or errors with the Resource
Compiler with newer system headers (VC10 and later) which
have macro names defined with more than 31 chars.
(backport from trunk r1499742)
Reviewed by: gsmith, sf

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

commit | commitdiff | tree

Stefan Fritsch [Thu, 4 Jul 2013 17:41:19 +0000 (17:41 +0000)]

vote+promote

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

commit | commitdiff | tree

Gregg Lewis Smith [Thu, 4 Jul 2013 17:14:51 +0000 (17:14 +0000)]

vote

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

commit | commitdiff | tree

Stefan Fritsch [Thu, 4 Jul 2013 13:32:43 +0000 (13:32 +0000)]

comment

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

commit | commitdiff | tree

Guenter Knauf [Thu, 4 Jul 2013 13:21:25 +0000 (13:21 +0000)]

propose.

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

commit | commitdiff | tree

Stefan Fritsch [Thu, 4 Jul 2013 12:44:13 +0000 (12:44 +0000)]

vote/comment/promote

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

commit | commitdiff | tree

Stefan Fritsch [Thu, 4 Jul 2013 09:36:12 +0000 (09:36 +0000)]

comment/vote/promote

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

commit | commitdiff | tree

Joe Orton [Wed, 3 Jul 2013 13:35:18 +0000 (13:35 +0000)]

Vote.

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

commit | commitdiff | tree

Stefan Fritsch [Wed, 3 Jul 2013 12:43:32 +0000 (12:43 +0000)]

propose open_htaccess hook

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

commit | commitdiff | tree

Joe Orton [Wed, 3 Jul 2013 08:00:45 +0000 (08:00 +0000)]

OCSP fix done.

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

commit | commitdiff | tree

Joe Orton [Wed, 3 Jul 2013 08:00:28 +0000 (08:00 +0000)]

Merge 1488296 from trunk:

* modules/ssl/ssl_util_ocsp.c (read_response): Ignore empty buckets in
the brigade, which can be left over from line splitting. Fixes case
where the OCSP response was only partially read from the wire.

Reviewed by: jorton, jim, sf

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

commit | commitdiff | tree

Stefan Fritsch [Tue, 2 Jul 2013 19:41:26 +0000 (19:41 +0000)]

vote+promote, remove duplicate mod_proxy proposal

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

commit | commitdiff | tree

Eric Covener [Tue, 2 Jul 2013 16:38:24 +0000 (16:38 +0000)]

please review

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

commit | commitdiff | tree

Jim Jagielski [Mon, 1 Jul 2013 13:50:35 +0000 (13:50 +0000)]

2 votes

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

commit | commitdiff | tree

Joe Orton [Mon, 1 Jul 2013 12:04:45 +0000 (12:04 +0000)]

Add OCSP fix.

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

commit | commitdiff | tree

Joe Orton [Mon, 1 Jul 2013 09:02:13 +0000 (09:02 +0000)]

Merge r1498310 from trunk.

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

commit | commitdiff | tree

Guenter Knauf [Sun, 30 Jun 2013 21:09:10 +0000 (21:09 +0000)]

Update.

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

commit | commitdiff | tree

Guenter Knauf [Sun, 30 Jun 2013 21:07:28 +0000 (21:07 +0000)]

Simplify example (backport r1498176 from trunk).
Fix r.mpm_query() (backport r1498179 from trunk).

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

commit | commitdiff | tree

Rainer Jung [Fri, 28 Jun 2013 05:45:47 +0000 (05:45 +0000)]

Remove line added during the trunk sync in
r1491468. The line never was part of trunk.
CTR (mod_lua).

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

commit | commitdiff | tree

Rainer Jung [Fri, 28 Jun 2013 05:22:38 +0000 (05:22 +0000)]

- Move mod_lua items from trunk CHANGES to 2.4.
- Group mod_lua items in 2.4.4 CHANGES part.
- Remove redundant parts of the short sync with
trunk notice.

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 28 Jun 2013 04:59:33 +0000 (04:59 +0000)]

Propose easy votes to keep 2.4 in sync with trunk

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

commit | commitdiff | tree

Rainer Jung [Thu, 27 Jun 2013 23:08:52 +0000 (23:08 +0000)]

Slight clarification of CHANGES entry.

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

commit | commitdiff | tree

Rainer Jung [Thu, 27 Jun 2013 22:31:02 +0000 (22:31 +0000)]

Fix indentation (plus now needed line-wrap).
No functional change.
Followup to r1486454.
Backport of r1497588.

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

commit | commitdiff | tree

Jim Jagielski [Wed, 26 Jun 2013 13:01:00 +0000 (13:01 +0000)]

Merge r1496429 from trunk:

core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization
on Linux kernel versions 3.x and above.

PR: 55121
Submitted by: Bradley Heilbrun <apache heilbrun.org>
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@1496916 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 26 Jun 2013 13:00:03 +0000 (13:00 +0000)]

Merge r1491564 from trunk:

const goodness with nasty strrchr and strchr functions
(resolve warning in maintainer mode)

Submitted by: trawick
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Wed, 26 Jun 2013 12:59:31 +0000 (12:59 +0000)]

promote

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

commit | commitdiff | tree

Jim Jagielski [Wed, 26 Jun 2013 12:59:06 +0000 (12:59 +0000)]

vote and comment

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

commit | commitdiff | tree

Joe Orton [Wed, 26 Jun 2013 07:55:42 +0000 (07:55 +0000)]

Vote.

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

commit | commitdiff | tree

Guenter Knauf [Tue, 25 Jun 2013 14:52:38 +0000 (14:52 +0000)]

Updated doccu.

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

commit | commitdiff | tree

Guenter Knauf [Tue, 25 Jun 2013 14:25:26 +0000 (14:25 +0000)]

Update doccu.

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

commit | commitdiff | tree

Guenter Knauf [Tue, 25 Jun 2013 14:19:51 +0000 (14:19 +0000)]

Added new r:touch() function; updated docs.
(Backport r1495270, r1495665, r1495666)

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

commit | commitdiff | tree

Jeff Trawick [Tue, 25 Jun 2013 13:15:48 +0000 (13:15 +0000)]

whitespace changes only (indentation)

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

commit | commitdiff | tree

Jeff Trawick [Tue, 25 Jun 2013 13:13:49 +0000 (13:13 +0000)]

note

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

commit | commitdiff | tree

Jeff Trawick [Tue, 25 Jun 2013 12:12:17 +0000 (12:12 +0000)]

fix stray character

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

commit | commitdiff | tree

Jeff Trawick [Tue, 25 Jun 2013 11:59:57 +0000 (11:59 +0000)]

fix some new warnings in 2.4.5-dev

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

commit | commitdiff | tree

Jeff Trawick [Tue, 25 Jun 2013 11:56:38 +0000 (11:56 +0000)]

we lost SINGLE_LISTEN_UNSERIALIZED_ACCEPT on Linux 3.x :(

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

commit | commitdiff | tree

Jim Jagielski [Mon, 24 Jun 2013 18:15:55 +0000 (18:15 +0000)]

let's roll!

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

commit | commitdiff | tree

Jim Jagielski [Mon, 24 Jun 2013 18:15:17 +0000 (18:15 +0000)]

Some votes

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

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

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

RSS Atom