]>
granicus.if.org Git - apache/log
Jim Jagielski [Tue, 30 Apr 2013 14:19:43 +0000 (14:19 +0000)]
Merge r1465116 from trunk:
htpasswd: Add -v option to verify a password
htpasswd and htdbm could use some more refactoring...
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477651 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 Apr 2013 14:18:46 +0000 (14:18 +0000)]
Merge r1476680 from trunk:
mod_proxy: Clarify the usage suggestion for BalancerInherit and ProxyPassInherit.
Submitted by: minfrin
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477650 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 Apr 2013 14:18:13 +0000 (14:18 +0000)]
Merge r1387603, r1388029, r1420124, r1421288, r1421912, r1422943, r1422980, r1430575, r1439404 from trunk:
wtf are we doing merging in these from the parent??
These are server specific!
OK, enable/allow previous broken, bad behavior iff the user
really, really wants it. And warn that b-m isn't recommended
in those cases.
rjung's suggestions...
inherit inherit
Use inherit_set to let the global server set
the default for all vhosts.
Otherwise inherit would need to be disabled
redundantly in each vhost.
restrict inherit control to those fields that "require" it...
Redfine - we are just worried about balancers and workers, so have the directive clear about that.
Naming
ProxyPassInherit directive
Submitted by: jim, rjung, jim, jim, jim, jim
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477649 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 Apr 2013 14:12:52 +0000 (14:12 +0000)]
ipromote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477642 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 Apr 2013 14:11:45 +0000 (14:11 +0000)]
ivote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477641 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 30 Apr 2013 12:37:14 +0000 (12:37 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477594 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 30 Apr 2013 10:32:39 +0000 (10:32 +0000)]
Update the proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477536 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 29 Apr 2013 14:52:16 +0000 (14:52 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477114 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 29 Apr 2013 12:32:55 +0000 (12:32 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477002 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 29 Apr 2013 12:31:42 +0000 (12:31 +0000)]
Note that parseargs and parsebody actually returns two tables, not one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477001 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 29 Apr 2013 12:25:39 +0000 (12:25 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476993 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 29 Apr 2013 12:22:38 +0000 (12:22 +0000)]
Expand on how to set context specific directives. Also fix some typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476991 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Apr 2013 13:31:05 +0000 (13:31 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476764 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 28 Apr 2013 08:56:54 +0000 (08:56 +0000)]
Fix version number in mmn comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476737 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 23:14:11 +0000 (23:14 +0000)]
mod_authnz_ldap: Allow using exec: callouts like SSLPassphraseDialog
for AuthLDAPBindPassword.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1433478
http://svn.apache.org/viewvc?view=revision&revision=
1467523
http://svn.apache.org/viewvc?view=revision&revision=
1467792
2.4.x patch: http://people.apache.org/~druggeri/patches/AuthLDAPBindPasswordExec-2.4.patch
(
20130119 - updated to include minor mmn bump)
(
20130412 - updated to not use static var - thx, wrowe)
Submitted by: druggeri
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476694 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 23:12:15 +0000 (23:12 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476693 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 23:04:02 +0000 (23:04 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476691 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 22:32:42 +0000 (22:32 +0000)]
mod_proxy_balancer: Add failontimeout parameter. Timeout will put worker
in error state if an IO timeout is detected.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1465839
2.4.x patch: http://people.apache.org/~druggeri/patches/httpd-2.4.x-failontimeout.patch
Submitted by: druggeri
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476689 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 22:30:54 +0000 (22:30 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476688 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 22:18:02 +0000 (22:18 +0000)]
mod_ssl: Catch missing, mismatched or encrypted client cert/key pairs
with SSLProxyMachineCertificateFile/Path directives. PR 52212, PR 54698.
(check at startup, to prevent segfaults at proxy request time)
trunk patches: https://svn.apache.org/r1374214
https://svn.apache.org/r1374216
https://svn.apache.org/r1375445
https://svn.apache.org/r1467593
2.4.x patch: https://people.apache.org/~kbrand/PR52212_54698_2.4.x.patch
Submitted by: kbrand
Reviewed by: jorton, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476685 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 22:15:16 +0000 (22:15 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476684 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 22:07:08 +0000 (22:07 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476683 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 21:50:49 +0000 (21:50 +0000)]
Comment and vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476682 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 21:40:59 +0000 (21:40 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476679 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 21:32:55 +0000 (21:32 +0000)]
mod_auth_digest: avoid crash if shm init fails.
trunk patch: https://svn.apache.org/r1463047
Submitted by: sf
Reviewed by: humbedooh, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476676 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 21:27:43 +0000 (21:27 +0000)]
htpasswd/htdbm: Fix hash generation bug. PR 54735
trunk patch: https://svn.apache.org/r1465115
Submitted by: MadMaverick9 <asfbugzilla meinkino.ch>
Reviewed by: sf, covener, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476674 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sat, 27 Apr 2013 21:22:43 +0000 (21:22 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476673 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 21:18:45 +0000 (21:18 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476672 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 21:06:14 +0000 (21:06 +0000)]
Propose mod_cache_socache for backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476670 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 18:58:54 +0000 (18:58 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476658 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 18:28:39 +0000 (18:28 +0000)]
Backport r1476652:
Note that the buffer size is set to a maximum of 65536 when AJP is used as
per http://www.mail-archive.com/dev@httpd.apache.org/msg41843.html.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476653 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 26 Apr 2013 15:04:18 +0000 (15:04 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476245 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 26 Apr 2013 11:38:14 +0000 (11:38 +0000)]
* Whitespace fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476147 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 26 Apr 2013 11:36:24 +0000 (11:36 +0000)]
Merge r1470183 from trunk:
Add workaround for gcc bug on sparc/64bit
PR: 52900
Submitted by: sf
Reviewed by: sf, covener, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476144 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 26 Apr 2013 11:31:59 +0000 (11:31 +0000)]
Merge r1471449 from trunk:
* Fix null pointer dereference in case SetEnvif and SetEnvIfExpr are used
together.
PR: 54881
Submitted by: rpluem
Reviewed by: rpluem, covener, humbedooh
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476143 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 26 Apr 2013 11:18:40 +0000 (11:18 +0000)]
vote + promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476140 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 26 Apr 2013 11:01:17 +0000 (11:01 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476134 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 26 Apr 2013 08:48:19 +0000 (08:48 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476107 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 26 Apr 2013 08:35:58 +0000 (08:35 +0000)]
* Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476100 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 26 Apr 2013 07:42:01 +0000 (07:42 +0000)]
htdigest: Fix buffer overflow when reading digest
password file with very long lines.
PR 54893.
Backport of r1475878 from trunk.
Proposed/Backported by: rjung
Reviewed by: humbedooh, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476089 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 26 Apr 2013 01:45:32 +0000 (01:45 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476020 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 26 Apr 2013 01:40:38 +0000 (01:40 +0000)]
Rebuild urlmapping doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476018 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 26 Apr 2013 01:35:28 +0000 (01:35 +0000)]
DirectoryIndex and mod_autoindex
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476015 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 26 Apr 2013 01:12:51 +0000 (01:12 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476010 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 25 Apr 2013 18:18:26 +0000 (18:18 +0000)]
Some easy votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1475885 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 25 Apr 2013 18:10:20 +0000 (18:10 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1475881 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 25 Apr 2013 14:11:14 +0000 (14:11 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1475785 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 25 Apr 2013 11:29:07 +0000 (11:29 +0000)]
xforms, bloody xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1475707 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 25 Apr 2013 11:25:26 +0000 (11:25 +0000)]
Note that ProxyPass[Match] doesn't work within a <Directory> context.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1475706 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 22 Apr 2013 14:14:09 +0000 (14:14 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1470531 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Apr 2013 14:10:10 +0000 (14:10 +0000)]
Merge r1458020, r1463044, r1463045 from trunk:
more simplification with ap_bin2hex()
use apr_array for an array
Submitted by: Christophe JAILLET (with small tweaks by myself)
PR: 52881
ap_log_error already logs the error string, no need to log it twice
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1470527 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Apr 2013 14:09:12 +0000 (14:09 +0000)]
Merge r1463056 from trunk:
Use %pm available since apr 1.3 instead of an extra call to apr_strerror
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1470526 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Apr 2013 14:08:42 +0000 (14:08 +0000)]
Merge r1458004 from trunk:
add md5 function, too
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1470524 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Apr 2013 14:07:56 +0000 (14:07 +0000)]
Merge r1463052 from trunk:
use ap_log_error's facility to print the apr error string instead of
calling apr_strerror() explicitly
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1470522 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Apr 2013 14:07:14 +0000 (14:07 +0000)]
ivote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1470520 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 22 Apr 2013 13:53:45 +0000 (13:53 +0000)]
Quoted args
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1470515 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 21 Apr 2013 06:24:56 +0000 (06:24 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1470268 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 21 Apr 2013 06:06:59 +0000 (06:06 +0000)]
a few easy votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1470267 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Apr 2013 15:39:29 +0000 (15:39 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1470179 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 19 Apr 2013 18:36:42 +0000 (18:36 +0000)]
Rebuild stuff.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1469985 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 19 Apr 2013 17:21:02 +0000 (17:21 +0000)]
Adds anchor for LA-U
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1469960 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 18 Apr 2013 16:17:19 +0000 (16:17 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1469406 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 18 Apr 2013 16:13:26 +0000 (16:13 +0000)]
Add mod_macro syntax to the highlighter
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1469401 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 18 Apr 2013 16:11:58 +0000 (16:11 +0000)]
fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1469400 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 17 Apr 2013 16:14:51 +0000 (16:14 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468990 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 17 Apr 2013 16:07:10 +0000 (16:07 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468989 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 17 Apr 2013 14:29:41 +0000 (14:29 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468931 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 17 Apr 2013 14:27:40 +0000 (14:27 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468930 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 17 Apr 2013 13:25:25 +0000 (13:25 +0000)]
add in skiplist
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468903 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 17 Apr 2013 05:58:00 +0000 (05:58 +0000)]
Remove vote for now in order to take rjung's comment on dev list into consideration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468754 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 16 Apr 2013 20:33:12 +0000 (20:33 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468600 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 16 Apr 2013 20:15:18 +0000 (20:15 +0000)]
Update the proposal, provide a rollup patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468593 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Tue, 16 Apr 2013 15:48:13 +0000 (15:48 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468475 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Tue, 16 Apr 2013 15:46:04 +0000 (15:46 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468474 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 16 Apr 2013 07:07:31 +0000 (07:07 +0000)]
Easy votes to keep 2.4 close to trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468318 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 15 Apr 2013 16:08:45 +0000 (16:08 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468138 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 15 Apr 2013 16:05:16 +0000 (16:05 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468136 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 15 Apr 2013 16:01:48 +0000 (16:01 +0000)]
fixed validation error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468133 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Mon, 15 Apr 2013 15:59:05 +0000 (15:59 +0000)]
update comment, and move proposal to stalled section for 2.2.x, too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468132 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 15 Apr 2013 14:20:09 +0000 (14:20 +0000)]
Update proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468092 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 15 Apr 2013 13:51:47 +0000 (13:51 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468077 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 15 Apr 2013 13:49:27 +0000 (13:49 +0000)]
Add some CHANGES entries for today's backports.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468074 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 15 Apr 2013 13:42:31 +0000 (13:42 +0000)]
Fix revision number in proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1468061 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 15 Apr 2013 12:45:47 +0000 (12:45 +0000)]
Add a comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467983 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Apr 2013 12:42:29 +0000 (12:42 +0000)]
Merge r1467765 from trunk:
Fix crash in mod_log_config when logging
request end time for a failed request
(LogFormat contains %{end}t).
The request_config for mod_log_config might
not be initialized.
PR 54828.
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467981 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Apr 2013 12:42:00 +0000 (12:42 +0000)]
Merge r1452128 from trunk:
Remove useless tests.
Turn
if (*x && apr_isspace(*x))
into
if (apr_isspace(*x))
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467980 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Apr 2013 12:41:23 +0000 (12:41 +0000)]
Merge r1457450, r1457610, r1457995, r1458003 from trunk:
Expression parser: Add the ability to apply a SHA1 hash to strings within
the parser.
Expression parser: use hex encoding for the sha1 hash.
sha1 now does hex encoding
simplify code by using ap_bin2hex()
Submitted by: minfrin, sf, sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467979 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Apr 2013 12:39:55 +0000 (12:39 +0000)]
Merge r1463750, r1463754, r1464675 from trunk:
Use apr_file_printf(... "%pm"...) instead of explicit call to apr_strerror
Use apr_psprintf(... "%pm"...) instead of explicit call to apr_strerror
Use apr_file_printf(... "%pm"...) instead of explicit call to apr_strerror
+ add some spaces to improve formatting
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467978 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Apr 2013 12:38:36 +0000 (12:38 +0000)]
Merge r1452281 from trunk:
cache_storage: remove useless test + update function name in debug log + skip as soon as we know headers do not match
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467976 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Apr 2013 12:37:59 +0000 (12:37 +0000)]
Merge r1458456 from trunk:
Useful extensions...
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467975 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Apr 2013 12:36:23 +0000 (12:36 +0000)]
Merge r1457437, r1457520 from trunk:
Expression parser: Add the ability to base64 encode and base64 decode
strings within the parser.
Remove the comment, this is done.
Submitted by: minfrin
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467969 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Apr 2013 12:35:15 +0000 (12:35 +0000)]
ipromote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467967 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Apr 2013 12:34:22 +0000 (12:34 +0000)]
ivote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467966 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 15 Apr 2013 07:42:37 +0000 (07:42 +0000)]
Vote, pick a nit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467883 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 14 Apr 2013 16:49:59 +0000 (16:49 +0000)]
vote/promote/cleanup addressed comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467802 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sun, 14 Apr 2013 15:59:14 +0000 (15:59 +0000)]
Include all trunk patches
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467796 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 14 Apr 2013 14:41:54 +0000 (14:41 +0000)]
Update the proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467784 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 14 Apr 2013 14:38:56 +0000 (14:38 +0000)]
Add r1458003 to the proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467783 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 14 Apr 2013 12:11:45 +0000 (12:11 +0000)]
Easy votes, promote, comment, propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467771 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Apr 2013 14:22:21 +0000 (14:22 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1467642 13f79535 -47bb-0310-9956-
ffa450edef68