summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* rpm spec file: Add mod_macro and mod_cache_socache to the RPM build.Graham Leggett2013-04-301-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477815 13f79535-47bb-0310-9956-ffa450edef68
* mod_cache_socache: New cache implementation backed by mod_socacheGraham Leggett2013-04-305-0/+2168
| | | | | | | | | 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
* Propose.Graham Leggett2013-04-301-0/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477679 13f79535-47bb-0310-9956-ffa450edef68
* Propose.Graham Leggett2013-04-301-0/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477672 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1305167, r1330964, r1388660, r1388899, r1391396, r1391398, r1392214, ↵Jim Jagielski2013-04-3011-13/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge r1465116 from trunk:Jim Jagielski2013-04-306-55/+116
| | | | | | | | | | | | 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
* Merge r1476680 from trunk:Jim Jagielski2013-04-302-22/+2
| | | | | | | | | | 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
* Merge r1387603, r1388029, r1420124, r1421288, r1421912, r1422943, r1422980, ↵Jim Jagielski2013-04-305-5/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* ipromoteJim Jagielski2013-04-301-24/+24
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477642 13f79535-47bb-0310-9956-ffa450edef68
* ivoteJim Jagielski2013-04-301-4/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477641 13f79535-47bb-0310-9956-ffa450edef68
* Propose.Graham Leggett2013-04-301-0/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477594 13f79535-47bb-0310-9956-ffa450edef68
* Update the proposal.Graham Leggett2013-04-301-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477536 13f79535-47bb-0310-9956-ffa450edef68
* Propose.Graham Leggett2013-04-291-0/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477114 13f79535-47bb-0310-9956-ffa450edef68
* xformsDaniel Gruno2013-04-293-8/+17
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477002 13f79535-47bb-0310-9956-ffa450edef68
* Note that parseargs and parsebody actually returns two tables, not one.Daniel Gruno2013-04-291-6/+15
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477001 13f79535-47bb-0310-9956-ffa450edef68
* xformsDaniel Gruno2013-04-298-16/+97
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476993 13f79535-47bb-0310-9956-ffa450edef68
* Expand on how to set context specific directives. Also fix some typosDaniel Gruno2013-04-291-5/+16
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476991 13f79535-47bb-0310-9956-ffa450edef68
* Updates.Lucien Gentis2013-04-282-477/+503
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476764 13f79535-47bb-0310-9956-ffa450edef68
* Fix version number in mmn comment.Rainer Jung2013-04-281-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476737 13f79535-47bb-0310-9956-ffa450edef68
* mod_authnz_ldap: Allow using exec: callouts like SSLPassphraseDialogGraham Leggett2013-04-277-14/+113
| | | | | | | | | | | | | | | | | 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
* Vote and promote.Graham Leggett2013-04-271-11/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476693 13f79535-47bb-0310-9956-ffa450edef68
* Vote.Graham Leggett2013-04-271-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476691 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy_balancer: Add failontimeout parameter. Timeout will put workerGraham Leggett2013-04-277-6/+32
| | | | | | | | | | | | | 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
* Vote, promote.Graham Leggett2013-04-271-7/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476688 13f79535-47bb-0310-9956-ffa450edef68
* mod_ssl: Catch missing, mismatched or encrypted client cert/key pairsGraham Leggett2013-04-273-12/+20
| | | | | | | | | | | | | | | | | 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
* Vote, promote.Graham Leggett2013-04-271-11/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476684 13f79535-47bb-0310-9956-ffa450edef68
* Vote.Graham Leggett2013-04-271-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476683 13f79535-47bb-0310-9956-ffa450edef68
* Comment and vote.Graham Leggett2013-04-271-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476682 13f79535-47bb-0310-9956-ffa450edef68
* Vote.Graham Leggett2013-04-271-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476679 13f79535-47bb-0310-9956-ffa450edef68
* mod_auth_digest: avoid crash if shm init fails.Graham Leggett2013-04-273-4/+5
| | | | | | | | | 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
* htpasswd/htdbm: Fix hash generation bug. PR 54735Graham Leggett2013-04-274-24/+17
| | | | | | | | | | 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
* voteGregg Lewis Smith2013-04-271-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476673 13f79535-47bb-0310-9956-ffa450edef68
* Vote, promote.Graham Leggett2013-04-271-5/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476672 13f79535-47bb-0310-9956-ffa450edef68
* Propose mod_cache_socache for backport.Graham Leggett2013-04-271-0/+14
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476670 13f79535-47bb-0310-9956-ffa450edef68
* Propose.Graham Leggett2013-04-271-0/+39
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476658 13f79535-47bb-0310-9956-ffa450edef68
* Backport r1476652:Graham Leggett2013-04-271-4/+7
| | | | | | | | 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
* Update.Lucien Gentis2013-04-261-1/+24
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476245 13f79535-47bb-0310-9956-ffa450edef68
* * Whitespace fixesRuediger Pluem2013-04-261-5/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476147 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1470183 from trunk:Ruediger Pluem2013-04-263-6/+9
| | | | | | | | | | | | | 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
* Merge r1471449 from trunk:Ruediger Pluem2013-04-263-9/+4
| | | | | | | | | | | | | * 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
* vote + promoteDaniel Gruno2013-04-261-7/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476140 13f79535-47bb-0310-9956-ffa450edef68
* voteEric Covener2013-04-261-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476134 13f79535-47bb-0310-9956-ffa450edef68
* * Vote and promoteRuediger Pluem2013-04-261-5/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476107 13f79535-47bb-0310-9956-ffa450edef68
* * ProposeRuediger Pluem2013-04-261-0/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476100 13f79535-47bb-0310-9956-ffa450edef68
* htdigest: Fix buffer overflow when reading digestRainer Jung2013-04-263-7/+7
| | | | | | | | | | | | | | 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
* RebuildRich Bowen2013-04-2613-18/+28
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476020 13f79535-47bb-0310-9956-ffa450edef68
* Rebuild urlmapping doc.Rich Bowen2013-04-262-2/+21
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476018 13f79535-47bb-0310-9956-ffa450edef68
* DirectoryIndex and mod_autoindexRich Bowen2013-04-261-0/+21
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476015 13f79535-47bb-0310-9956-ffa450edef68
* vote/promoteEric Covener2013-04-261-12/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476010 13f79535-47bb-0310-9956-ffa450edef68
* Some easy votesDaniel Gruno2013-04-251-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1475885 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status