]>
granicus.if.org Git - apache/log
Eric Covener [Wed, 24 Dec 2008 15:07:11 +0000 (15:07 +0000)]
document no-cache envvar
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@729317
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 24 Dec 2008 15:03:33 +0000 (15:03 +0000)]
look for 'no-cache' in subprocess_env to prevent the saving
of an otherwise cacheable response.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@729316
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 24 Dec 2008 14:21:45 +0000 (14:21 +0000)]
Make "HeaderName" and "ReadmeName" be stored in simple entries "header" and "readme" respectively.
Side effect:
In the case that multiple "HeaderName"s or multiple "ReadmeName"s exist in one directory section.
Before this change, the first directive is effective.
After this change, the last directive is effective.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@729314
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 24 Dec 2008 13:35:58 +0000 (13:35 +0000)]
Foo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@729312
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 24 Dec 2008 13:10:52 +0000 (13:10 +0000)]
remove dup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@729310
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 24 Dec 2008 13:08:20 +0000 (13:08 +0000)]
return apr_status_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@729309
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 24 Dec 2008 13:04:34 +0000 (13:04 +0000)]
style changes only
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@729308
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Wed, 24 Dec 2008 02:22:38 +0000 (02:22 +0000)]
Add in the ability to fetch from headers_in.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@729194
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 23 Dec 2008 20:00:57 +0000 (20:00 +0000)]
* These files get generated during build and hence do not need to be in svn.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@729080
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 23 Dec 2008 18:39:56 +0000 (18:39 +0000)]
Add in the useful slotmem memory module, from httpd-scoreboard.
Cleaned up...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@729059
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 22 Dec 2008 21:34:59 +0000 (21:34 +0000)]
ditto hack from mpm_default.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728787
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Mon, 22 Dec 2008 21:15:32 +0000 (21:15 +0000)]
Hack to add basic support for LuaJIT.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728779
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 22 Dec 2008 21:01:20 +0000 (21:01 +0000)]
httpd 2.x is further modular; presume pcre is yet another .dll
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728772
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 22 Dec 2008 20:36:51 +0000 (20:36 +0000)]
pcre, and therefore dftables, aren't built within httpd anymore
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728765
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 22 Dec 2008 17:29:04 +0000 (17:29 +0000)]
Small typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728730
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Dec 2008 14:27:36 +0000 (14:27 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728701
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 22 Dec 2008 13:58:28 +0000 (13:58 +0000)]
Small typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728695
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 22 Dec 2008 06:47:42 +0000 (06:47 +0000)]
* Comment out unused pstack_dump for the time being until it is used, a better
compile time conditional is found or it is removed from the code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728623
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 22 Dec 2008 06:45:32 +0000 (06:45 +0000)]
* Remove unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728621
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Mon, 22 Dec 2008 01:05:25 +0000 (01:05 +0000)]
Use the HTTP_INTERNAL_SERVER_ERROR define instead of 500 directly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728568
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 22:58:56 +0000 (22:58 +0000)]
Fix C90 forbids mixed declarations and code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728547
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 22:54:07 +0000 (22:54 +0000)]
Fix mixed declarations and code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728545
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 22:53:08 +0000 (22:53 +0000)]
Fix more ISO C90 forbids mixed declarations and code...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728544
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 22:40:43 +0000 (22:40 +0000)]
Rename rstack_dump to apl_rstack_dump.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728540
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 22:38:07 +0000 (22:38 +0000)]
Attempt to make mod_lua compile under a strict c89 compiler by moving all variable declarations to be before code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728539
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 22:25:22 +0000 (22:25 +0000)]
Remove some extra logging, and make it more debug instead of warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728535
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 22:21:54 +0000 (22:21 +0000)]
Change apl_get_lua_state to take a apl_vm_spec instead of a filename, and to
load the bytecode if it is present, rather than the file, as this gets the
inline config file blocks hooks working again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728531
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 21:41:52 +0000 (21:41 +0000)]
Reformat mod_lua according to the HTTP Server Project C Style Guide:
<http://httpd.apache.org/dev/styleguide.html>
No functional changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728516
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 21:32:04 +0000 (21:32 +0000)]
Include standard ASF license block.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728512
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 21:31:02 +0000 (21:31 +0000)]
Make all of the hook callbacks static functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728511
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 21:29:11 +0000 (21:29 +0000)]
Fixup lua_config.c with prefix rename, and make mod_lua.c so it compiles again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728509
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 21:27:01 +0000 (21:27 +0000)]
Rename all files in mod_lua to have a lua_ prefix, as things like 'config.h' are way to generic and will often conflict with other include files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728508
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 21:17:15 +0000 (21:17 +0000)]
Rename most of the module formally known as mod_wombat to mod_lua conventions, switching apw prefixes for apl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728506
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 20:56:05 +0000 (20:56 +0000)]
Make pstack_dump a static function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728498
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 20:55:51 +0000 (20:55 +0000)]
Remove old commented out code, if we need any of this in the future, we always will have the svn history.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728497
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 21 Dec 2008 20:48:19 +0000 (20:48 +0000)]
Rename mod_wombat -> mod_lua.
Note that this isn't a complete transformation yet, but it should basically compile and load as mod_lua.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728494
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 21 Dec 2008 19:54:55 +0000 (19:54 +0000)]
text... wonderful editable text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728484
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 21 Dec 2008 08:08:52 +0000 (08:08 +0000)]
Update examples to be more per-directory agnostic, identify examples that
seem to be inherently per-directory oriented (REQUEST_URI vs REQUEST_FILENAME)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728400
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 21 Dec 2008 08:04:29 +0000 (08:04 +0000)]
Various cleanups and per-directory behavior differences
Submitted By: Bob Ionescu
Reviewed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728399
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 21 Dec 2008 08:02:32 +0000 (08:02 +0000)]
Clarification of regexes/examples for rewrite flags.
Submitted by: Bob Ionescu
Reviewed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728398
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Dec 2008 16:00:32 +0000 (16:00 +0000)]
Update after english file modification.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728292
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 20 Dec 2008 01:53:26 +0000 (01:53 +0000)]
axe r->path_info in a more standard way, suggested by Aleksander Budzynowski
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728220
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Fri, 19 Dec 2008 20:01:21 +0000 (20:01 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728127
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Fri, 19 Dec 2008 19:57:02 +0000 (19:57 +0000)]
Documentation revisions for r726082.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728126
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 19 Dec 2008 13:39:55 +0000 (13:39 +0000)]
typo spotted by Vincent Bray
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728020
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 19 Dec 2008 12:59:52 +0000 (12:59 +0000)]
*) mod_rewrite: Introduce DiscardPathInfo|DPI flag to stop the troublesome
way that per-directory rewrites append the previous notion of PATH_INFO
to each substitution before evaluating subsequent rules.
PR38642 [Eric Covener]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728015
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Thu, 18 Dec 2008 17:51:18 +0000 (17:51 +0000)]
Use apr_cpystrn instead of strncpy since strncpy can create an unterminated string.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@727777
13f79535 -47bb-0310-9956-
ffa450edef68
Paul J. Reder [Thu, 18 Dec 2008 17:31:28 +0000 (17:31 +0000)]
Removing entry now that it is backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@727774
13f79535 -47bb-0310-9956-
ffa450edef68
Paul J. Reder [Thu, 18 Dec 2008 17:23:26 +0000 (17:23 +0000)]
Remove entry now that it is backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@727770
13f79535 -47bb-0310-9956-
ffa450edef68
Paul J. Reder [Thu, 18 Dec 2008 17:15:24 +0000 (17:15 +0000)]
Remove entry now that it is backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@727768
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 18 Dec 2008 16:52:33 +0000 (16:52 +0000)]
Slight fix to r712611: introductory comment should
stay above the blocks for the individual MPMs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@727761
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 18 Dec 2008 04:22:10 +0000 (04:22 +0000)]
* This one is now backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@727634
13f79535 -47bb-0310-9956-
ffa450edef68
Paul J. Reder [Thu, 18 Dec 2008 00:25:44 +0000 (00:25 +0000)]
Removing entry that was backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@727602
13f79535 -47bb-0310-9956-
ffa450edef68
Paul J. Reder [Wed, 17 Dec 2008 19:20:50 +0000 (19:20 +0000)]
Set Listen protocol to "https" if port is set to 443 and no proto is specified
(as documented but not implemented). PR 46066 [Dan Poirier <poirier pobox.com>]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@727477
13f79535 -47bb-0310-9956-
ffa450edef68
Paul J. Reder [Wed, 17 Dec 2008 18:03:09 +0000 (18:03 +0000)]
Output -M and -S dumps (modules and vhosts) to stdout instead of stderr.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@727452
13f79535 -47bb-0310-9956-
ffa450edef68
Paul J. Reder [Tue, 16 Dec 2008 14:08:19 +0000 (14:08 +0000)]
*) mod_ldap: Avoid a segfault when result->rc is checked in uldap_connection_init
when result is NULL. This could happen if LDAP initialization failed.
PR 45994. [Dan Poirier <poirier pobox.com>]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@727053
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 16 Dec 2008 00:08:01 +0000 (00:08 +0000)]
* Change some "apr_palloc / memcpy" to apr_pstrmemdup
PR: 39519
Submitted by: Christophe JAILLET <christophe.jaillet wanadoo.fr>
* Remove unnecessary casts
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726884
13f79535 -47bb-0310-9956-
ffa450edef68
Paul J. Reder [Tue, 16 Dec 2008 00:04:42 +0000 (00:04 +0000)]
core.xml: Clarify the Location and LocationMatch directive doc to emphasize
restrictions on valid configuration values.
PR: 45987
Submitted by: Dan Poirier
Reviewed by: Paul J. Reder
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726882
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 15 Dec 2008 20:45:29 +0000 (20:45 +0000)]
* Correctly save Content-Encoding of cachable entity.
PR: 46401
Submitted by: Dan Poirier <poirier pobox.com>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726796
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 15 Dec 2008 20:36:47 +0000 (20:36 +0000)]
* Fix r->content_encoding for inflate_in and inflate_out filters.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726794
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 15 Dec 2008 20:22:07 +0000 (20:22 +0000)]
* Fix r->content_encoding in deflate_out_filter if it was set before.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726791
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 15 Dec 2008 07:47:30 +0000 (07:47 +0000)]
* Do not add an empty argument if we do not have any args for the script.
Fixes a regression from r682475.
PR: 46380
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726636
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 14 Dec 2008 17:27:46 +0000 (17:27 +0000)]
Commiting built files (726499)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726500
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 14 Dec 2008 17:18:16 +0000 (17:18 +0000)]
These were outdated, so updating the .fr translation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726499
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 14 Dec 2008 15:04:44 +0000 (15:04 +0000)]
The DN was fetched from the entry, and the password is passed by the client.
--Cette ligne, et les suivantes ci-dessous, seront ignorées--
M manual/mod/mod_authnz_ldap.xml
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726461
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 13 Dec 2008 15:12:06 +0000 (15:12 +0000)]
Remove safe duplication...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726217
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Fri, 12 Dec 2008 21:12:01 +0000 (21:12 +0000)]
From r726118: remove unused sb_type member from process_score
structure and do major MMN bump.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726120
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Fri, 12 Dec 2008 21:05:37 +0000 (21:05 +0000)]
Remove unused sb_type member from process_score structure and
do major MMN bump. The sb_type field was added in r89115 but not
removed in r89554 along with related unused additions.
Submitted by: Torsten Foertsch <torsten.foertsch@gmx.net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726118
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Fri, 12 Dec 2008 20:35:32 +0000 (20:35 +0000)]
Silence compiler warnings in the same manner as for the
worker MPM; see r726113.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726114
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Fri, 12 Dec 2008 20:31:09 +0000 (20:31 +0000)]
I'm not 100% sure about this, but it seems to silence the
compiler warnings generated by r101236 (which was, in turn,
intended to do the same).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726113
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 12 Dec 2008 20:20:40 +0000 (20:20 +0000)]
mod_ssl: Make the size of the per-dir-reneg request-body buffer
configurable, by popular demand:
* modules/ssl/ssl_private.h: Define DEFAULT_RENEG_BUFFER_SIZE.
(SSLDirConfigRec): Add nRenegBufferSize field.
* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLRenegBufferSize): New
function.
(ssl_config_perdir_create, ssl_config_perdir_merge): Handle
nRenegBufferSize.
* modules/ssl/ssl_engine_io.c (ssl_io_buffer_fill): Take max buffer
size as an argument rather than compile-time constant.
* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Pass
nRenegBufferSize to ssl_io_buffer_fill.
* modules/ssl/mod_ssl.c (ssl_config_cmds): Add SSLRenegBufferSize.
PR: 39243
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726109
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Fri, 12 Dec 2008 20:00:04 +0000 (20:00 +0000)]
silence compiler warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726102
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Fri, 12 Dec 2008 18:25:17 +0000 (18:25 +0000)]
Per suggestions by Roy T. Fielding:
- remove Match directive, allow Require to be negated
- rename <Match*> directives to <Require*>
- rename <RequireNotAny> to <RequireNone>
- disable <RequireNotAll>
- rename MergeAuthz to AuthMerging and change its arguments to Off|And|Or
Also convert text formatting macros into functions, and revise
authz_core_check_section() so that check for non-negative directives
follows De Morgan optimization.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726082
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Fri, 12 Dec 2008 17:59:57 +0000 (17:59 +0000)]
Note that 2.3.0 was tagged, but not released
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726077
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 12 Dec 2008 16:31:15 +0000 (16:31 +0000)]
Treat proxy/balancers normally and independently...
also, allow nice pretty
Making all in proxy
...
Making all in proxy/balancers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726068
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 12 Dec 2008 16:08:16 +0000 (16:08 +0000)]
* server/mpm_common.c (dummy_connection): If possible, use a non-SSL
listening port to use for the dummy connection, to avoid causing
(confusing) error log spam by sending EOF down an SSL port.
PR: 39653
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726065
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 12 Dec 2008 15:57:39 +0000 (15:57 +0000)]
* include/util_filter.h (ap_fputstrs): Mark with sentinel attribute
for gcc >= 4.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726060
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 12 Dec 2008 15:56:15 +0000 (15:56 +0000)]
socache API tweaks based on chrisd's review:
* include/ap_socache.h (ap_socache_provider_t::store): Take a pool.
(ap_socache_provider_t::retrieve): Guarantee APR_NOTFOUND for a
"not found" result.
(ap_socache_provider_t::remove): Return an apr_status_t.
* modules/cache/mod_socache_dc.c, modules/cache/mod_socache_dbm.c,
modules/cache/mod_socache_shmcb,
modules/cache/mod_socache_memcache.c: Adjust accordingly.
* modules/ssl/ssl_scache.c (ssl_scache_store): Pass pool to
sesscache->store.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726059
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 12 Dec 2008 15:18:21 +0000 (15:18 +0000)]
* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLSessionCache): Allow
using socache provider config defaults by omitting the arguments, so
e.g. "SSLSessionCache shmcb" or even "SSLSessionCache default"
should now DTRT.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726034
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 12 Dec 2008 13:48:09 +0000 (13:48 +0000)]
* modules/cache/mod_socache_memcache.c (socache_mc_init): Remove references
to SSL in log messages.
(socache_mc_retrieve): Use 'data' not 'der'; correctly return an error
for the overflow case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726008
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 12 Dec 2008 13:37:59 +0000 (13:37 +0000)]
* modules/cache/mod_socache_memcache.c (socache_mc_create): Fail if
no argument is given.
(socache_mc_init): Increment the taglen field.
(socache_mc_id2key): Renamed from mc_session_id2sz and catch key
name overflow, per rpluem's review.
(socache_mc_store, socache_mc_retrieve, socache_mc_remove):
Adjust for new id2key interface.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726007
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Fri, 12 Dec 2008 08:46:47 +0000 (08:46 +0000)]
Add configuration of the Flush provider for mod_proxy_fdpass.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725946
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Fri, 12 Dec 2008 08:33:31 +0000 (08:33 +0000)]
Move the provider interface to a separate header file for mod_proxy_fdpass.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725943
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Fri, 12 Dec 2008 08:24:28 +0000 (08:24 +0000)]
Convert the flushing mechanism used before passing the socket to be based on a provider, and include a default one using a flush.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725942
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Fri, 12 Dec 2008 08:04:47 +0000 (08:04 +0000)]
Add a new mod_proxy_fdpass module to pass a client connection off to a separate daemon.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725940
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 10 Dec 2008 16:50:58 +0000 (16:50 +0000)]
Fix meta-file link error introduced in r725291
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725334
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 10 Dec 2008 16:31:31 +0000 (16:31 +0000)]
update for sync with English docs.
English Revison: 420990
Submitted by: kawai
Reviewed by: takashi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725327
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 10 Dec 2008 14:09:15 +0000 (14:09 +0000)]
Add an incomplete document for mod_lbmethod_heartbeat.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725291
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 10 Dec 2008 14:06:02 +0000 (14:06 +0000)]
Add incomplete documents for mod_heartbeat and mod_heartmonitor.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725289
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 10 Dec 2008 13:01:31 +0000 (13:01 +0000)]
Hopefully the final fix for the subreq/filter issue. The
prob was that we at this point could still have some
stale and incorrect refs when we adjusted the f-stack.
So move the update earlier so when we adjust, we're
affecting r. R
\9f diger and Jim pretty much
simultaneously :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725077
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 10 Dec 2008 02:26:48 +0000 (02:26 +0000)]
Add security section to mod_privileges docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724959
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Tue, 9 Dec 2008 18:40:18 +0000 (18:40 +0000)]
whitespace cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724813
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 9 Dec 2008 18:19:20 +0000 (18:19 +0000)]
reset chain if we need to...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724805
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 9 Dec 2008 18:11:36 +0000 (18:11 +0000)]
* modules/ssl/ssl_private.h: Add a big fat warning about
the SSLModConfigRec lifetime.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724802
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 9 Dec 2008 17:26:50 +0000 (17:26 +0000)]
* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLSessionCache): Don't fix
the socache instance for the lifetime of the process since it is
allocated out of pconf.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724789
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 9 Dec 2008 15:19:08 +0000 (15:19 +0000)]
* include/ap_socache.h: Use C++ safety wrappers, and rename ->delete
to ->remove since the former is a C++ reserved word.
* modules/ssl/ssl_scache.c (ssl_scache_remove): Update accordingly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724745
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 9 Dec 2008 14:52:59 +0000 (14:52 +0000)]
* include/ap_socache.h: Define AP_SOCACHE_DEFAULT_PROVIDER as a
default provider name, to allow consumers to use a default provider
if not configured otherwise.
* modules/cache/mod_socache_shmcb.c (register_hooks): Register shmcb
as the default provider.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724723
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 9 Dec 2008 14:41:21 +0000 (14:41 +0000)]
Improve mod_ssl's environment variable extraction to correctly handle
DNs with duplicate tags:
* modules/ssl/ssl_engine_vars.c:
Augment the ssl_var_lookup_ssl_cert_dn_rec table with a flag
to indicate whether RDNs of the given NID should be extracted
to the environment.
(extract_dn, modssl_var_extract_dns): New functions.
* modules/ssl/ssl_private.h (modssl_var_extract_dns): Add prototype.
* modules/ssl/ssl_engine_kernel.c: Remove SSL_*_DN_ from the list
of variables to insert into the environment.
(ssl_hook_Fixup): Use modssl_var_extract_dns to insert the
SSL_*_DN_ variables efficiently and accurately, handling
certs with duplicate RDN tags correctly.
PR: 45875
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724717
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 9 Dec 2008 13:11:45 +0000 (13:11 +0000)]
Reduce config overhead for use of socache interface by allowing
default paths to be used if none are configured:
* include/ap_socache.h (ap_socache_provider_t::create):
Allow arg to be NULL to force use of defaults.
(ap_socache_provider_t::init): Rename 'namespace' parameter to
'cname' and restrict to allow use in filesystem paths.
* modules/cache/mod_socache_dbm.c (socache_dbm_create,
socache_dbm_init),
modules/cache/mod_socache_shmcb.c (socache_shmcb_create,
socache_shmcb_init):
Default to use of runtimedir-relative paths if no
explicit path is configured.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724682
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 9 Dec 2008 11:50:45 +0000 (11:50 +0000)]
Increment version.ent. We are at 2.3.1-dev.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724667
13f79535 -47bb-0310-9956-
ffa450edef68