]> granicus.if.org Git - apache/log
apache
11 years agoMerge r1528556 from trunk:
Eric Covener [Mon, 7 Oct 2013 19:12:57 +0000 (19:12 +0000)]
Merge r1528556 from trunk:

  *) mod_rewrite: Make rewrite websocket aware to allow proxying.
     PR 55598. [Chris Harris <chris.harris kitware com>]

Submitted By: [Chris Harris <chris.harris kitware com>
Reviewed By: jim, rjung, covener

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

11 years agovote/promote some small ones
Eric Covener [Mon, 7 Oct 2013 19:09:31 +0000 (19:09 +0000)]
vote/promote some small ones

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

11 years agopropose yet another Windows glitch
Jeff Trawick [Mon, 7 Oct 2013 16:28:43 +0000 (16:28 +0000)]
propose yet another Windows glitch

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

11 years agopropose another Windows fix
Jeff Trawick [Sun, 6 Oct 2013 23:18:43 +0000 (23:18 +0000)]
propose another Windows fix

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

11 years agopropose
Jeff Trawick [Sun, 6 Oct 2013 21:40:03 +0000 (21:40 +0000)]
propose

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

11 years agoUpdates.
Lucien Gentis [Sat, 5 Oct 2013 13:10:01 +0000 (13:10 +0000)]
Updates.

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

11 years agoAdd comment regarding skiplist requirement
Jeff Trawick [Sat, 5 Oct 2013 12:50:21 +0000 (12:50 +0000)]
Add comment regarding skiplist requirement

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

11 years agomerge r1529277 from trunk
Gregg Lewis Smith [Fri, 4 Oct 2013 20:07:57 +0000 (20:07 +0000)]
merge r1529277 from trunk
WebSocket support requires Winsock2

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

11 years agoPropose.
Rainer Jung [Thu, 3 Oct 2013 21:54:42 +0000 (21:54 +0000)]
Propose.

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

11 years ago* mod_ldap: Don't filter subgroups on cn=*
Rainer Jung [Thu, 3 Oct 2013 18:55:16 +0000 (18:55 +0000)]
* mod_ldap: Don't filter subgroups on cn=*

Proposed by: covener
Reviewed by: jim, rjung

Backport of r1528143 from trunk.

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

11 years agoMultiple backports from trunk:
Rainer Jung [Thu, 3 Oct 2013 18:52:55 +0000 (18:52 +0000)]
Multiple backports from trunk:
    - rotatelog: Factor out from doRotate, main; make error handling consistant
                 and print the actual error to stderr
                 PR 45084
                 Backport of r1374247 from trunk.
    - rotatelog: Cleanups, no functional change.  Drop revision history,
                 "svn log" works; use APR_PATH_MAX; constify more
                 Backport of r1409800 from trunk.
    - rotatelog: error[120] is already defined in this function. Just use
                 it instead of shadowing.
                 Backport of r1416121 from trunk.
    - rotatelog: Use apr_snprintf(... "%pm"...) instead of explicit call
                 to apr_strerror
                 Backport of r1463736 from trunk.
    - mod_deflate: style fix (no code change)
                 Backport of r1499679 from trunk.
    - mod_socache_shmcb: Correct the use of the printf formatter.
                 Backport of r1493925 from trunk.
    - mod_cache_socache: Fixed signed<->unsigned compiler warning.
                 Backport of r1490550 from trunk.
    - mod_ssl: add missing space between directive description and syntax
                 Backport of r1509983 from trunk.
    - mpm/winnt: style consistency in winnt's worker_main
                 Backport of r1520760 from trunk.

Proposed by: jailletc36
Reviewed by: jim, rjung

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

11 years agoab: Add wait time, fix processing time, and output write errors only if
Rainer Jung [Thu, 3 Oct 2013 18:44:04 +0000 (18:44 +0000)]
ab: Add wait time, fix processing time, and output write errors only if
they occured.

§rd patch of P45355.

Proposed by: jailletc36
Reviewed by: jim, rjung

Backport of r1488471 from turnk.

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

11 years agoworker MPM: Don't forcibly kill worker threads if the child process is
Rainer Jung [Thu, 3 Oct 2013 18:35:41 +0000 (18:35 +0000)]
worker MPM: Don't forcibly kill worker threads if the child process is
exiting gracefully.

Submitted by: Oracle, via trawick

This modification was made some years ago for Oracle HTTP Server
by an Oracle employee.

Proposed by: trawick
Reviewed by: jim, rjung

Backport of r1526220 from trunk.

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

11 years agoWildcard name-based vhosts printed twice in apachectl -S
Rainer Jung [Thu, 3 Oct 2013 18:31:22 +0000 (18:31 +0000)]
Wildcard name-based vhosts printed twice in apachectl -S

PR54948

Proposed by: covener
Reviewed by: jim, rjung

Backport of r1485675 and r1525000 from trunk.

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

11 years agoAdd AuthBasicUseDigestAlgorithm directive to allow migration of
Rainer Jung [Thu, 3 Oct 2013 18:22:48 +0000 (18:22 +0000)]
Add AuthBasicUseDigestAlgorithm directive to allow migration of
passwords from digest to basic authentication.

Proposed by: chrisd
Reviewed by: jim, rjung

Backport of r1514064 from trunk.

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

11 years agoPromote.
Rainer Jung [Thu, 3 Oct 2013 16:44:47 +0000 (16:44 +0000)]
Promote.

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

11 years agoAdd some love and peace.
Rainer Jung [Thu, 3 Oct 2013 16:42:19 +0000 (16:42 +0000)]
Add some love and peace.

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

11 years agoldap vote
Jim Jagielski [Thu, 3 Oct 2013 11:38:33 +0000 (11:38 +0000)]
ldap vote

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

11 years agoPropose PR 55306 fix.
Ben Reser [Thu, 3 Oct 2013 06:13:11 +0000 (06:13 +0000)]
Propose PR 55306 fix.

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

11 years agofollow up r1528438
Gregg Lewis Smith [Wed, 2 Oct 2013 18:13:35 +0000 (18:13 +0000)]
follow up r1528438
skiplist now in apr 1.5

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

11 years agoBackport PR 55598 fix
Jim Jagielski [Wed, 2 Oct 2013 16:41:24 +0000 (16:41 +0000)]
Backport PR 55598 fix

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

11 years agoSince skiplist is now in apr, adjust patch.
Jim Jagielski [Wed, 2 Oct 2013 12:28:48 +0000 (12:28 +0000)]
Since skiplist is now in apr, adjust patch.

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

11 years agoremove... now in apr 1.5
Jim Jagielski [Wed, 2 Oct 2013 12:20:14 +0000 (12:20 +0000)]
remove... now in apr 1.5

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

11 years agopropose mod_ssl (EC)DH ephemeral keying patch
Kaspar Brand [Tue, 1 Oct 2013 17:27:20 +0000 (17:27 +0000)]
propose mod_ssl (EC)DH ephemeral keying patch

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

11 years agopropose a small mod_ldap contribution
Eric Covener [Tue, 1 Oct 2013 16:44:15 +0000 (16:44 +0000)]
propose a small mod_ldap contribution

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

11 years agoez votes
Jim Jagielski [Tue, 1 Oct 2013 12:00:42 +0000 (12:00 +0000)]
ez votes

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

11 years agothis was also added.... fold into 1 userland change
Jim Jagielski [Tue, 1 Oct 2013 11:55:34 +0000 (11:55 +0000)]
this was also added.... fold into 1 userland change

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

11 years agobackported
Jim Jagielski [Tue, 1 Oct 2013 11:53:33 +0000 (11:53 +0000)]
backported

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

11 years agoMerge r1488644 from trunk:
Jim Jagielski [Tue, 1 Oct 2013 11:52:38 +0000 (11:52 +0000)]
Merge r1488644 from trunk:

Add a new -l parameter in order not to check the length of the responses. This can be usefull with dynamic pages.
PR9945, PR27888, PR42040
Submitted by: jailletc36
Reviewed/backported by: jim

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

11 years agoMerge r1451849 from trunk:
Jim Jagielski [Tue, 1 Oct 2013 11:51:44 +0000 (11:51 +0000)]
Merge r1451849 from trunk:

The 2 first patches from PR45355 have been ported
Submitted by: jailletc36
Reviewed/backported by: jim

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

11 years agoProposal
Christophe Jaillet [Tue, 1 Oct 2013 09:18:13 +0000 (09:18 +0000)]
Proposal

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

11 years agovote/promote/note
Jeff Trawick [Mon, 30 Sep 2013 19:19:18 +0000 (19:19 +0000)]
vote/promote/note

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

11 years agovotes
Jim Jagielski [Mon, 30 Sep 2013 13:47:28 +0000 (13:47 +0000)]
votes

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

11 years agoProposals
Christophe Jaillet [Sun, 29 Sep 2013 07:13:09 +0000 (07:13 +0000)]
Proposals

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

11 years agoUpdates.
Lucien Gentis [Sat, 28 Sep 2013 15:29:47 +0000 (15:29 +0000)]
Updates.

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

11 years agoxforms
Jim Jagielski [Thu, 26 Sep 2013 19:02:33 +0000 (19:02 +0000)]
xforms

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

11 years agoFollow up to r1526598: add missing util_fcgi source files.
Chris Darroch [Thu, 26 Sep 2013 17:54:24 +0000 (17:54 +0000)]
Follow up to r1526598: add missing util_fcgi source files.

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

11 years agoMerge r1513492 from trunk:
Jim Jagielski [Thu, 26 Sep 2013 16:46:28 +0000 (16:46 +0000)]
Merge r1513492 from trunk:

follow up to r1513454: fill in missing log number
Submitted by: trawick
Reviewed/backported by: jim

  * util_fcgi API to 2.4.x (allows mod_proxy_fcgi to be kept in sync, along
        with other less important reasons)
            trunk: http://svn.apache.org/r1513454 and http://svn.apache.org/r1513492
                2.4.x: copy server/util_fcgi.c and include/util_fcgi.h, then apply
                           http://people.apache.org/~trawick/patch-after-copying-util_fcgi-splat.txt
                               +1: trawick, jim, chrisd

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

11 years agoVote and promote.
Chris Darroch [Thu, 26 Sep 2013 16:32:45 +0000 (16:32 +0000)]
Vote and promote.

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

11 years agoMerge r1524158 from trunk:
Jim Jagielski [Thu, 26 Sep 2013 11:15:41 +0000 (11:15 +0000)]
Merge r1524158 from trunk:

More cool info ;)

Reviewed/backported by: jim

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

11 years agoMerge r1525931 from trunk:
Jeff Trawick [Thu, 26 Sep 2013 11:12:51 +0000 (11:12 +0000)]
Merge r1525931 from trunk:

APLOG_STARTUP messages shouldn't have custom ErrorLogFormat applied.

Reviewed by: jim, covener

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

11 years agovote/promote
Eric Covener [Wed, 25 Sep 2013 19:00:55 +0000 (19:00 +0000)]
vote/promote

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

11 years agohmmm, "no votes yet" meant I was just proposing and not voting on existing patches yet
Jeff Trawick [Wed, 25 Sep 2013 16:48:25 +0000 (16:48 +0000)]
hmmm, "no votes yet" meant I was just proposing and not voting on existing patches yet

I didn't mean to omit my vote here.

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

11 years agono votes yet
Jeff Trawick [Wed, 25 Sep 2013 16:44:54 +0000 (16:44 +0000)]
no votes yet

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

11 years agovote on backports
Jim Jagielski [Wed, 25 Sep 2013 16:04:50 +0000 (16:04 +0000)]
vote on backports

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

11 years agopropose
Jeff Trawick [Tue, 24 Sep 2013 16:09:38 +0000 (16:09 +0000)]
propose

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

11 years agoMerge r1525588 from trunk:
Eric Covener [Mon, 23 Sep 2013 13:42:44 +0000 (13:42 +0000)]
Merge r1525588 from trunk:

add a note about sub-group searching and large groups.

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

11 years agoRemove grossly outdated browser compatibility column
Rich Bowen [Mon, 23 Sep 2013 01:09:23 +0000 (01:09 +0000)]
Remove grossly outdated browser compatibility column

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

11 years agoVarious rebuilds
Rich Bowen [Mon, 23 Sep 2013 00:25:09 +0000 (00:25 +0000)]
Various rebuilds

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

11 years agoMissing '$' in variable.
Rich Bowen [Mon, 23 Sep 2013 00:21:50 +0000 (00:21 +0000)]
Missing '$' in variable.

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

11 years agoRebuild mod_macro chnages.
Rich Bowen [Mon, 23 Sep 2013 00:19:12 +0000 (00:19 +0000)]
Rebuild mod_macro chnages.

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

11 years agoMerges doc restructure from trunk.
Rich Bowen [Mon, 23 Sep 2013 00:17:51 +0000 (00:17 +0000)]
Merges doc restructure from trunk.

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

11 years agoRebuild
Rich Bowen [Sun, 22 Sep 2013 13:52:10 +0000 (13:52 +0000)]
Rebuild

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

11 years ago2.4 syntax instead of order/allow/deny
Rich Bowen [Sun, 22 Sep 2013 13:50:59 +0000 (13:50 +0000)]
2.4 syntax instead of order/allow/deny

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

11 years agoRebuild
Rich Bowen [Sun, 22 Sep 2013 13:47:39 +0000 (13:47 +0000)]
Rebuild

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

11 years agoUpdates.
Lucien Gentis [Sat, 21 Sep 2013 14:23:50 +0000 (14:23 +0000)]
Updates.

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

11 years agopropose 2.4 patch for removing duplicate NVH entries for wildcard/default
Eric Covener [Fri, 20 Sep 2013 15:17:27 +0000 (15:17 +0000)]
propose 2.4 patch for removing duplicate NVH entries for wildcard/default
servers.

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

11 years agovotes and stuff
Jim Jagielski [Wed, 18 Sep 2013 11:30:24 +0000 (11:30 +0000)]
votes and stuff

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

11 years agobackport mod_lua changes(r1524321): check for big endian and don't fiddle with bits...
Daniel Gruno [Wed, 18 Sep 2013 08:08:58 +0000 (08:08 +0000)]
backport mod_lua changes(r1524321): check for big endian and don't fiddle with bits if so.

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

11 years agoEasy and quick vote
Daniel Ruggeri [Tue, 17 Sep 2013 22:42:29 +0000 (22:42 +0000)]
Easy and quick vote

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

11 years agorebuild
Rich Bowen [Tue, 17 Sep 2013 22:28:05 +0000 (22:28 +0000)]
rebuild

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

11 years agosubject/verb
Rich Bowen [Tue, 17 Sep 2013 22:26:05 +0000 (22:26 +0000)]
subject/verb

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

11 years agoRebuild
Rich Bowen [Tue, 17 Sep 2013 22:16:43 +0000 (22:16 +0000)]
Rebuild

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

11 years agoquickreference and directives contain the same list but quickreference is more useful.
Rich Bowen [Tue, 17 Sep 2013 22:14:18 +0000 (22:14 +0000)]
quickreference and directives contain the same list but quickreference is more useful.

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

11 years ago * mod_cache: Correct LOGNO which has not been updated when r1481396 was backported
Jim Jagielski [Tue, 17 Sep 2013 18:48:06 +0000 (18:48 +0000)]
  * mod_cache: Correct LOGNO which has not been updated when r1481396 was backported
      trunk: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.c?r1=1481396&r2=1481395&pathrev=1481396
          2.4.x: http://people.apache.org/~jailletc36/1481396.patch
              +1: jailletc36, druggeri, jim

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

11 years agoMerge r1523239 from trunk:
Jim Jagielski [Tue, 17 Sep 2013 18:47:19 +0000 (18:47 +0000)]
Merge r1523239 from trunk:

mod_auth_digest: Be more specific when the realm mismatches because the
realm has not been specified.

Submitted by: minfrin
Reviewed/backported by: jim

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

11 years agoMerge r1524101 from trunk:
Jim Jagielski [Tue, 17 Sep 2013 18:45:38 +0000 (18:45 +0000)]
Merge r1524101 from trunk:

Add note to balancer manager whether changes will/will not survive a restart
Submitted by: druggeri
Reviewed/backported by: jim

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

11 years agoapplied
Jim Jagielski [Tue, 17 Sep 2013 18:43:43 +0000 (18:43 +0000)]
applied

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

11 years agoMerge r1523235 from trunk:
Jim Jagielski [Tue, 17 Sep 2013 18:43:30 +0000 (18:43 +0000)]
Merge r1523235 from trunk:

mod_cache: Avoid a crash with strcmp() when the hostname is not provided.

Submitted by: minfrin
Reviewed/backported by: jim

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

11 years agoipromote
Jim Jagielski [Tue, 17 Sep 2013 18:42:42 +0000 (18:42 +0000)]
ipromote

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

11 years agoivote
Jim Jagielski [Tue, 17 Sep 2013 18:42:12 +0000 (18:42 +0000)]
ivote

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

11 years agoMore manager coolness
Jim Jagielski [Tue, 17 Sep 2013 18:41:37 +0000 (18:41 +0000)]
More manager coolness

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

11 years agoPropose AuthBasicUseDigestAlgorithm directive.
Chris Darroch [Tue, 17 Sep 2013 18:34:39 +0000 (18:34 +0000)]
Propose AuthBasicUseDigestAlgorithm directive.

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

11 years agoVote and promote.
Chris Darroch [Tue, 17 Sep 2013 18:24:52 +0000 (18:24 +0000)]
Vote and promote.

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

11 years agoPropose note about BalancerPersist in balancer manager
Daniel Ruggeri [Tue, 17 Sep 2013 15:55:10 +0000 (15:55 +0000)]
Propose note about BalancerPersist in balancer manager

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

11 years agoEasy votes
Daniel Ruggeri [Tue, 17 Sep 2013 15:00:35 +0000 (15:00 +0000)]
Easy votes

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

11 years agoPropose simple one
Daniel Ruggeri [Tue, 17 Sep 2013 14:55:48 +0000 (14:55 +0000)]
Propose simple one

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

11 years agopodx stuff
Jim Jagielski [Tue, 17 Sep 2013 14:09:51 +0000 (14:09 +0000)]
podx stuff

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

11 years agoBackport a few things in mod_lua:
Daniel Gruno [Tue, 17 Sep 2013 10:38:12 +0000 (10:38 +0000)]
Backport a few things in mod_lua:
- Fix filters
- Add setcookie/getcookie
- Add preliminary WebSocket support
- Update documentation

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

11 years agoskiplist.c now in 2.4.x
Gregg Lewis Smith [Mon, 16 Sep 2013 06:49:55 +0000 (06:49 +0000)]
skiplist.c now in 2.4.x

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

11 years agoPropose
Christophe Jaillet [Sun, 15 Sep 2013 12:16:44 +0000 (12:16 +0000)]
Propose

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

11 years agobackport + compat
Eric Covener [Sat, 14 Sep 2013 21:04:47 +0000 (21:04 +0000)]
backport + compat

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

11 years agoAdd missing backport to proposal.
Rainer Jung [Sat, 14 Sep 2013 20:37:11 +0000 (20:37 +0000)]
Add missing backport to proposal.

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

11 years agoCorrect Changelog entry
Christophe Jaillet [Sat, 14 Sep 2013 18:51:05 +0000 (18:51 +0000)]
Correct Changelog entry

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

11 years agomod_headers: Add 'Header note header-name note-name' to copy a headers
Graham Leggett [Sat, 14 Sep 2013 15:31:35 +0000 (15:31 +0000)]
mod_headers: Add 'Header note header-name note-name' to copy a headers
value into a note (so a CGI/Proxy header can be deleted and logged)

trunk patch: http://svn.apache.org/r1520908

Submitted by: covener
Reviewed by: jim, humbedooh

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

11 years agomod_headers: Add 'Header SetIfEmpty header-name val' to only set
Graham Leggett [Sat, 14 Sep 2013 15:29:04 +0000 (15:29 +0000)]
mod_headers: Add 'Header SetIfEmpty header-name val' to only set
a header if it's not already there (can't do this with Edit)

trunk patch: http://svn.apache.org/1496338

Submitted by: covener
Reviewed by: jim, humbedooh

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

11 years agomod_logio: new format-specifier %S (sum) which is the sum of received
Graham Leggett [Sat, 14 Sep 2013 15:25:11 +0000 (15:25 +0000)]
mod_logio: new format-specifier %S (sum) which is the sum of received
and sent byte counts.
PR54015 [Martijn T. <apache_bugzilla@mindcontrolled.nl>, Christophe JAILLET]

trunk: http://svn.apache.org/r1484910
       http://svn.apache.org/r1517386

Submitted by: jailletc36
Reviewed by: jim, humbedooh

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

11 years agomod_deflate: Improve error detection when decompressing request bodies
Graham Leggett [Sat, 14 Sep 2013 15:21:13 +0000 (15:21 +0000)]
mod_deflate: Improve error detection when decompressing request bodies
with trailing garbage: handle case where trailing bytes are in
the same bucket.

trunk: http://svn.apache.org/r1502772

Submitted by: rjung
Reviewed by: jim, humbedooh

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

11 years agoauthz_groupfile/authz_user: don't log at ERROR for AUTHZ_DENIED, since
Graham Leggett [Sat, 14 Sep 2013 15:15:38 +0000 (15:15 +0000)]
authz_groupfile/authz_user: don't log at ERROR for AUTHZ_DENIED, since
authz_core is collecting providers results. Subsequently reported in PR55523?

trunk patch: http://svn.apache.org/r1517366

Submitted by: covener
Reviewed by: jim, humbedooh

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

11 years agomod_ldap: add TRACE5 for LDAP retries
Graham Leggett [Sat, 14 Sep 2013 15:11:30 +0000 (15:11 +0000)]
mod_ldap: add TRACE5 for LDAP retries

trunk patch: http://svn.apache.org/r1510085

Submitted by: covener
Reviewed by: jim, humbedooh

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

11 years agoFix formatting.
Graham Leggett [Sat, 14 Sep 2013 15:08:12 +0000 (15:08 +0000)]
Fix formatting.

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

11 years agomod_ldap: retry on an LDAP timeout during authn.
Graham Leggett [Sat, 14 Sep 2013 15:07:43 +0000 (15:07 +0000)]
mod_ldap: retry on an LDAP timeout during authn.

trunk patch: http://svn.apache.org/r1510084

Submitted by: covener
Reviewed by: jim, humbedooh

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

11 years agomod_ldap: "LDAPReferrals off" does not disable LDAPReferrals feature.
Graham Leggett [Sat, 14 Sep 2013 15:02:10 +0000 (15:02 +0000)]
mod_ldap:  "LDAPReferrals off" does not disable LDAPReferrals feature.
Make "off" really "off" and add "unset" to take SDK defaults

trunk patch: http://svn.apache.org/r1517388
       docs: http://svn.apache.org/r1518265

Submitted by: covener
Reviewed by: jim, humbedooh

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

11 years agocore: Restore "core_output_filter: writing data to the network", but at TRACE1.
Graham Leggett [Sat, 14 Sep 2013 14:56:33 +0000 (14:56 +0000)]
core: Restore "core_output_filter: writing data to the network", but at TRACE1.

trunk patch: http://svn.apache.org/r1501294

Submitted by: covener
Reviewed by: jim, humbedooh

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

11 years agoWinNT MPM: crash-o-matic with "Listen <portnumber> <unrecognized>"
Graham Leggett [Sat, 14 Sep 2013 14:51:48 +0000 (14:51 +0000)]
WinNT MPM: crash-o-matic with "Listen <portnumber> <unrecognized>"

trunk patch: http://svn.apache.org/r1520368

Submitted by: trawick
Reviewed by: covener, humbedooh

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

11 years agomodules: Fix some compiler warnings.
Graham Leggett [Sat, 14 Sep 2013 14:44:23 +0000 (14:44 +0000)]
modules: Fix some compiler warnings.

trunk patch: http://svn.apache.org/r1500345
             http://svn.apache.org/r1500362
             http://svn.apache.org/r1500423
             http://svn.apache.org/r1500483
             http://svn.apache.org/r1500519

Submitted by: fuankg
Reviewed by: jim, minfrin

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

11 years agoVote, promote.
Graham Leggett [Sat, 14 Sep 2013 14:40:34 +0000 (14:40 +0000)]
Vote, promote.

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

11 years agoskiplist: Add skiplist capability to httpd
Graham Leggett [Sat, 14 Sep 2013 14:26:55 +0000 (14:26 +0000)]
skiplist: Add skiplist capability to httpd

2.4.x patch: http://people.apache.org/~jim/patches/httpd-2.4-skiplist.patch

Submitted by: jim
Reviewed by: druggeri, minfrin

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

11 years agoVote, promote.
Graham Leggett [Sat, 14 Sep 2013 14:22:47 +0000 (14:22 +0000)]
Vote, promote.

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

11 years agoEasy votes: sync 2.4 and trunk
Graham Leggett [Sat, 14 Sep 2013 14:12:54 +0000 (14:12 +0000)]
Easy votes: sync 2.4 and trunk
  - Avoid some memory allocation and work when TRACE1 is not activated
  - fix typo in include guard
  - indent
  - No need to lower the string before removing the path, it is just a waste of time...
  - Save a few cycles

trunk patch: http://svn.apache.org/r1451478
             http://svn.apache.org/r1514215
             http://svn.apache.org/r1452195
             http://svn.apache.org/r1517025
             http://svn.apache.org/r1517045

Submitted by: jailletc36
Reviewed by: jim, minfrin

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