]>
granicus.if.org Git - apache/log
Graham Leggett [Tue, 7 May 2013 19:38:51 +0000 (19:38 +0000)]
Backport
1480046 .
Fix spelling mistake, no code change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1480048 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Tue, 7 May 2013 18:36:56 +0000 (18:36 +0000)]
Adding .fr translation for windows platform doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1480008 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 7 May 2013 16:20:30 +0000 (16:20 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479967 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 7 May 2013 13:47:55 +0000 (13:47 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479907 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 7 May 2013 13:28:29 +0000 (13:28 +0000)]
update french translation to reflect the current auth syntax
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479903 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 7 May 2013 12:12:54 +0000 (12:12 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479875 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 7 May 2013 12:08:08 +0000 (12:08 +0000)]
Catch up with the actual modern way of allowing/denying access
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479873 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 7 May 2013 11:54:12 +0000 (11:54 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479869 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 7 May 2013 11:47:59 +0000 (11:47 +0000)]
mod_macro is no longer a third party module (even if people need 2.4.5-dev to get it, it has been backported)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479866 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 6 May 2013 17:52:46 +0000 (17:52 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479655 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 6 May 2013 17:50:03 +0000 (17:50 +0000)]
mention mod_macro in CHANGES and add compatibility note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479653 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 6 May 2013 11:44:28 +0000 (11:44 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479529 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 5 May 2013 22:30:51 +0000 (22:30 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479413 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 5 May 2013 09:50:56 +0000 (09:50 +0000)]
comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479273 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 5 May 2013 09:39:33 +0000 (09:39 +0000)]
- Wording improvemennt (I hope so)
- Add forgotten MD5 in apr_expr change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479269 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 5 May 2013 08:41:59 +0000 (08:41 +0000)]
typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479263 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 5 May 2013 08:37:03 +0000 (08:37 +0000)]
s/deliminator/delimiter/, let's stick to non-Perl jargon here.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479262 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 5 May 2013 08:30:25 +0000 (08:30 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479259 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 5 May 2013 08:22:00 +0000 (08:22 +0000)]
typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479256 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 5 May 2013 01:21:04 +0000 (01:21 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479223 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 4 May 2013 23:06:01 +0000 (23:06 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479217 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 4 May 2013 15:01:14 +0000 (15:01 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479121 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 4 May 2013 13:00:41 +0000 (13:00 +0000)]
Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479094 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 4 May 2013 12:52:00 +0000 (12:52 +0000)]
Change GIF icons to use a different palette, for more smoothness.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479092 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 3 May 2013 15:19:50 +0000 (15:19 +0000)]
Update proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1478833 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 3 May 2013 12:26:04 +0000 (12:26 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1478752 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 2 May 2013 16:56:58 +0000 (16:56 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1478442 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 2 May 2013 14:31:05 +0000 (14:31 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1478386 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 1 May 2013 20:48:32 +0000 (20:48 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1478182 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Wed, 1 May 2013 11:29:03 +0000 (11:29 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477951 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 30 Apr 2013 20:34:37 +0000 (20:34 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477816 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 30 Apr 2013 20:34:15 +0000 (20:34 +0000)]
rpm spec file: Add mod_macro and mod_cache_socache to the RPM build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477815 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 30 Apr 2013 16:10:02 +0000 (16:10 +0000)]
mod_cache_socache: New cache implementation backed by mod_socache
that replaces mod_mem_cache removed from httpd v2.2.
Add backported files, missed by the backport process in r1477652.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477708 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 30 Apr 2013 15:01:12 +0000 (15:01 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477679 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 30 Apr 2013 14:47:53 +0000 (14:47 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477672 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 Apr 2013 14:23:33 +0000 (14:23 +0000)]
Merge r1305167, r1330964, r1388660, r1388899, r1391396, r1391398, r1392214, r1406760, r1418648 from trunk:
Update transformations.
syntax for mod_b*.xml and mod_c*.xml
mod_cache_socache: New cache implementation backed by mod_socache
that replaces mod_mem_cache removed from httpd v2.2.
Windows build for mod_cache_socache added in r1388660
Fix the return values on mod_cache_socache's store_headers() implementation
to return APR errors codes and not DECLINED. We are committed to using this
implementation by this point, and any error should force us to stand down.
Submitted by: trawick
Reviewed by: minfrin
Apply proper APLOGNO codes for mod_cache_socache.
Added mod_cache_socache to NetWare build.
* Ensure that nkey is initialized.
mod_cache_socache: Don't clean up too soon. If we do, revalidated requests
lose their bodies.
Submitted by: minfrin, humbedooh, minfrin, gsmith, minfrin, minfrin, fuankg, rpluem, minfrin
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477652 13f79535 -47bb-0310-9956-
ffa450edef68
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
projects / apache / log