]> granicus.if.org Git - apache/log
apache
11 years agoRemove unneeded exports from mod_lua - part 2.
Guenter Knauf [Fri, 31 May 2013 07:03:15 +0000 (07:03 +0000)]
Remove unneeded exports from mod_lua - part 2.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1488114 13f79535-47bb-0310-9956-ffa450edef68

11 years agoAdd missing LoadModule line for mod_auth_form
Gregg Lewis Smith [Thu, 30 May 2013 21:38:06 +0000 (21:38 +0000)]
Add missing LoadModule line for mod_auth_form

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1488022 13f79535-47bb-0310-9956-ffa450edef68

11 years agoRemove unneeded exports from mod_lua.
Guenter Knauf [Thu, 30 May 2013 18:28:24 +0000 (18:28 +0000)]
Remove unneeded exports from mod_lua.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487956 13f79535-47bb-0310-9956-ffa450edef68

11 years agoRemove unnecessary global declarations of optional function
Joe Orton [Thu, 30 May 2013 07:23:52 +0000 (07:23 +0000)]
Remove unnecessary global declarations of optional function
implementations:

* modules/ssl/mod_ssl.c (ssl_proxy_enable, ssl_engine_disable): Mark
  static.

* modules/ssl/ssl_private.h (ssl_proxy_enable, ssl_engine_disable):
  Remove declarations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487775 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_ssl: Redesign NPN (Next Protocol Negotiation) API to avoid use of
Joe Orton [Thu, 30 May 2013 07:19:07 +0000 (07:19 +0000)]
mod_ssl: Redesign NPN (Next Protocol Negotiation) API to avoid use of
hooks API and inter-module hard linkage:

* modules/ssl/mod_ssl.h: Remove NPN hooks, add "modssl_register_npn"
  optional function and callback function type declarations for
  ssl_npn_advertise_protos, ssl_npn_proto_negotiated.

* modules/ssl/mod_ssl.c: Drop hooks.
  (modssl_register_npn): New optional function implementation.
  (ssl_register_hooks): Register it.

* modules/ssl/ssl_private.h (SSLConnRec): Add npn_advertfns,
  npn_negofns array fields.

* modules/ssl/ssl_engine_kernel.c (ssl_callback_AdvertiseNextProtos):
  Replace use of hook API with array iteration.

* modules/ssl/ssl_engine_io.c (ssl_io_filter_input): Likewise.

Reviewed by: Matthew Steele <mdsteele google.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487772 13f79535-47bb-0310-9956-ffa450edef68

11 years agoProvide proper module extension.
Guenter Knauf [Thu, 30 May 2013 06:58:19 +0000 (06:58 +0000)]
Provide proper module extension.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487769 13f79535-47bb-0310-9956-ffa450edef68

11 years agoRemoved non-existent funcions from header.
Guenter Knauf [Thu, 30 May 2013 02:43:03 +0000 (02:43 +0000)]
Removed non-existent funcions from header.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487710 13f79535-47bb-0310-9956-ffa450edef68

11 years agoRemoved non-existent funcion from header.
Guenter Knauf [Thu, 30 May 2013 02:03:09 +0000 (02:03 +0000)]
Removed non-existent funcion from header.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487706 13f79535-47bb-0310-9956-ffa450edef68

11 years ago* modules/filters/mod_ratelimit.c (rate_limit_filter): Log the error
Joe Orton [Wed, 29 May 2013 16:12:10 +0000 (16:12 +0000)]
* modules/filters/mod_ratelimit.c (rate_limit_filter): Log the error
  code.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487530 13f79535-47bb-0310-9956-ffa450edef68

11 years ago* server/protocol.c (r_flush): Use int return type as per declaration
Joe Orton [Wed, 29 May 2013 16:09:24 +0000 (16:09 +0000)]
* server/protocol.c (r_flush): Use int return type as per declaration
  of apr_vformatter(); no functional change.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487528 13f79535-47bb-0310-9956-ffa450edef68

11 years ago'make docs' xforms
Jeff Trawick [Wed, 29 May 2013 12:27:34 +0000 (12:27 +0000)]
'make docs' xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487452 13f79535-47bb-0310-9956-ffa450edef68

11 years agos/proxy image/proxy/
Jeff Trawick [Wed, 29 May 2013 12:26:17 +0000 (12:26 +0000)]
s/proxy image/proxy/

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487451 13f79535-47bb-0310-9956-ffa450edef68

11 years agoUse proper type to kill compiler warning.
Guenter Knauf [Mon, 27 May 2013 08:26:33 +0000 (08:26 +0000)]
Use proper type to kill compiler warning.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1486538 13f79535-47bb-0310-9956-ffa450edef68

11 years agoInform MSVC compiler there is a Lexical target so the compiler is
Gregg Lewis Smith [Sun, 26 May 2013 23:23:14 +0000 (23:23 +0000)]
Inform MSVC compiler there is a Lexical target so the compiler is
not confused which causes it to absorb some properties of the Lexical
target into the Debug target.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1486490 13f79535-47bb-0310-9956-ffa450edef68

11 years agolink to win_compiling from Install doc.
Eric Covener [Sun, 26 May 2013 18:49:32 +0000 (18:49 +0000)]
link to win_compiling from Install doc.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1486445 13f79535-47bb-0310-9956-ffa450edef68

11 years agoWhoops - one empty line too much.
Guenter Knauf [Sat, 25 May 2013 01:14:45 +0000 (01:14 +0000)]
Whoops - one empty line too much.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1486269 13f79535-47bb-0310-9956-ffa450edef68

11 years agoRemoved a bunch of empty lines.
Guenter Knauf [Sat, 25 May 2013 00:59:12 +0000 (00:59 +0000)]
Removed a bunch of empty lines.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1486266 13f79535-47bb-0310-9956-ffa450edef68

11 years agoChanged r.sleep(s) to r.usleep(ms).
Guenter Knauf [Sat, 25 May 2013 00:56:22 +0000 (00:56 +0000)]
Changed r.sleep(s) to r.usleep(ms).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1486265 13f79535-47bb-0310-9956-ffa450edef68

11 years agoClarify the existing behavior.
Graham Leggett [Fri, 24 May 2013 12:02:28 +0000 (12:02 +0000)]
Clarify the existing behavior.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1486027 13f79535-47bb-0310-9956-ffa450edef68

11 years agoReverting as per veto in http://svn.apache.org/r1486021.
Graham Leggett [Fri, 24 May 2013 11:59:51 +0000 (11:59 +0000)]
Reverting as per veto in http://svn.apache.org/r1486021.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1486026 13f79535-47bb-0310-9956-ffa450edef68

11 years agoEnsure that any meta buckets are stripped while parsing a chunk.
Graham Leggett [Thu, 23 May 2013 16:31:01 +0000 (16:31 +0000)]
Ensure that any meta buckets are stripped while parsing a chunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1485772 13f79535-47bb-0310-9956-ffa450edef68

11 years agoCVE-2013-1896
Graham Leggett [Thu, 23 May 2013 12:52:06 +0000 (12:52 +0000)]
CVE-2013-1896

mod_dav: Sending a MERGE request against a URI handled by mod_dav_svn with
the source href (sent as part of the request body as XML) pointing to a
URI that is not configured for DAV will trigger a segfault.

Submitted by: Ben Reser <ben reser.org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1485668 13f79535-47bb-0310-9956-ffa450edef68

11 years agoBe more clever when allocating memory for log item to be escaped.
Christophe Jaillet [Wed, 22 May 2013 20:38:35 +0000 (20:38 +0000)]
Be more clever when allocating memory for log item to be escaped.
This should be faster and save about 70-100 bytes in the request pool with the default config.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1485409 13f79535-47bb-0310-9956-ffa450edef68

11 years agoRevert change in order to apply a better solution.
Christophe Jaillet [Wed, 22 May 2013 19:45:23 +0000 (19:45 +0000)]
Revert change in order to apply a better solution.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1485379 13f79535-47bb-0310-9956-ffa450edef68

11 years agoRemoved obsolete define (already exists in mod_lua.h).
Guenter Knauf [Wed, 22 May 2013 17:19:47 +0000 (17:19 +0000)]
Removed obsolete define (already exists in mod_lua.h).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1485292 13f79535-47bb-0310-9956-ffa450edef68

11 years agoRemoved obsolete header include.
Guenter Knauf [Wed, 22 May 2013 17:18:20 +0000 (17:18 +0000)]
Removed obsolete header include.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1485291 13f79535-47bb-0310-9956-ffa450edef68

11 years agocore: Use a matching counter type.
Graham Leggett [Wed, 22 May 2013 16:11:23 +0000 (16:11 +0000)]
core: Use a matching counter type.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1485266 13f79535-47bb-0310-9956-ffa450edef68

11 years agocore: Make sure we allow unconstrained bodies from a proxy.
Graham Leggett [Wed, 22 May 2013 15:49:57 +0000 (15:49 +0000)]
core: Make sure we allow unconstrained bodies from a proxy.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1485257 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_deflate: Make sure we process any EOS bucket in our brigade and
Graham Leggett [Tue, 21 May 2013 19:28:29 +0000 (19:28 +0000)]
mod_deflate: Make sure we process any EOS bucket in our brigade and
save going the long way round.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484914 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_logio: new format-specifier %C (combined) which is the sum of received and sent...
Christophe Jaillet [Tue, 21 May 2013 19:26:10 +0000 (19:26 +0000)]
mod_logio: new format-specifier %C (combined) which is the sum of received and sent byte counts. PR54015

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484910 13f79535-47bb-0310-9956-ffa450edef68

11 years agocore: Remove apr_brigade_flatten(), buffering and duplicated code
Graham Leggett [Tue, 21 May 2013 16:10:02 +0000 (16:10 +0000)]
core: Remove apr_brigade_flatten(), buffering and duplicated code
from the HTTP_IN filter, parse chunks in a single pass with zero copy.
Reduce memory usage by 48 bytes per request.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484852 13f79535-47bb-0310-9956-ffa450edef68

11 years agoUpdate log message tags.
Graham Leggett [Tue, 21 May 2013 15:12:31 +0000 (15:12 +0000)]
Update log message tags.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484833 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_deflate: Remove assumptions as to when an EOS bucket might arrive.
Graham Leggett [Tue, 21 May 2013 15:10:46 +0000 (15:10 +0000)]
mod_deflate: Remove assumptions as to when an EOS bucket might arrive.
Gracefully step aside if the body size is zero.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484832 13f79535-47bb-0310-9956-ffa450edef68

11 years agoeol-style = native
André Malo [Mon, 20 May 2013 18:22:55 +0000 (18:22 +0000)]
eol-style = native

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484554 13f79535-47bb-0310-9956-ffa450edef68

11 years agoupdate transformation.
André Malo [Mon, 20 May 2013 18:11:07 +0000 (18:11 +0000)]
update transformation.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484550 13f79535-47bb-0310-9956-ffa450edef68

11 years agoeol-style
André Malo [Mon, 20 May 2013 18:05:58 +0000 (18:05 +0000)]
eol-style

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484545 13f79535-47bb-0310-9956-ffa450edef68

11 years agoUpdates.
Lucien Gentis [Mon, 20 May 2013 12:58:45 +0000 (12:58 +0000)]
Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484460 13f79535-47bb-0310-9956-ffa450edef68

11 years agoFix PR 54463 by removing an optional 'standard' parameter.
Christophe Jaillet [Mon, 20 May 2013 08:29:21 +0000 (08:29 +0000)]
Fix PR 54463 by removing an optional 'standard' parameter.
It has been no-une for more than 10 years and is not documented.
This also makes the code more consistent with other mod_auth modules.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484398 13f79535-47bb-0310-9956-ffa450edef68

11 years agoAdd in logno's
Jim Jagielski [Sun, 19 May 2013 19:32:59 +0000 (19:32 +0000)]
Add in logno's

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484343 13f79535-47bb-0310-9956-ffa450edef68

11 years agoUpdate.
Lucien Gentis [Sun, 19 May 2013 15:23:13 +0000 (15:23 +0000)]
Update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484295 13f79535-47bb-0310-9956-ffa450edef68

11 years agoUpdates.
Lucien Gentis [Sun, 19 May 2013 15:13:58 +0000 (15:13 +0000)]
Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484291 13f79535-47bb-0310-9956-ffa450edef68

11 years agoNetWare build: dont make the svn revision file a dependency.
Guenter Knauf [Fri, 17 May 2013 15:33:45 +0000 (15:33 +0000)]
NetWare build: dont make the svn revision file a dependency.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483867 13f79535-47bb-0310-9956-ffa450edef68

11 years agoCast uint16 return value to int.
Guenter Knauf [Thu, 16 May 2013 13:18:48 +0000 (13:18 +0000)]
Cast uint16 return value to int.
This fixes a crash on Windows when compiled with MSVC9.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483348 13f79535-47bb-0310-9956-ffa450edef68

11 years agoFixed Lua type.
Guenter Knauf [Thu, 16 May 2013 13:11:20 +0000 (13:11 +0000)]
Fixed Lua type.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483343 13f79535-47bb-0310-9956-ffa450edef68

11 years agoFixed compiler warning; sorted includes.
Guenter Knauf [Thu, 16 May 2013 13:00:48 +0000 (13:00 +0000)]
Fixed compiler warning; sorted includes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483334 13f79535-47bb-0310-9956-ffa450edef68

11 years agoMoved header protection to the top.
Guenter Knauf [Thu, 16 May 2013 12:49:16 +0000 (12:49 +0000)]
Moved header protection to the top.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483325 13f79535-47bb-0310-9956-ffa450edef68

11 years agoadd in child_init which is needed
Jim Jagielski [Thu, 16 May 2013 04:28:14 +0000 (04:28 +0000)]
add in child_init which is needed

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483190 13f79535-47bb-0310-9956-ffa450edef68

11 years agorevert... we are good
Jim Jagielski [Thu, 16 May 2013 04:02:38 +0000 (04:02 +0000)]
revert... we are good

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483188 13f79535-47bb-0310-9956-ffa450edef68

11 years agoupdate comments
Jim Jagielski [Thu, 16 May 2013 03:13:29 +0000 (03:13 +0000)]
update comments

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483178 13f79535-47bb-0310-9956-ffa450edef68

11 years agoforce subpool
Jim Jagielski [Thu, 16 May 2013 03:06:14 +0000 (03:06 +0000)]
force subpool

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483176 13f79535-47bb-0310-9956-ffa450edef68

11 years agoTypo in comment
Christophe Jaillet [Wed, 15 May 2013 19:39:16 +0000 (19:39 +0000)]
Typo in comment

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483044 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_proxy_http: Make the proxy-interim-response environment variable
Graham Leggett [Wed, 15 May 2013 19:27:10 +0000 (19:27 +0000)]
mod_proxy_http: Make the proxy-interim-response environment variable
effective by formally overriding origin server behaviour.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483027 13f79535-47bb-0310-9956-ffa450edef68

11 years agoAvoid over allocation when dealing with the common case. As stated in the comment...
Christophe Jaillet [Wed, 15 May 2013 18:52:49 +0000 (18:52 +0000)]
Avoid over allocation when dealing with the common case. As stated in the comment above : "We'll assume the common case where one bucket is enough".

Doing so should save a few hundreds bytes in the 'request' pool when processing a request

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483005 13f79535-47bb-0310-9956-ffa450edef68

11 years agocore: Use the proper macro for HTTP/1.1.
Graham Leggett [Wed, 15 May 2013 18:40:14 +0000 (18:40 +0000)]
core: Use the proper macro for HTTP/1.1.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482996 13f79535-47bb-0310-9956-ffa450edef68

11 years agocore: Stop ap_finalize_request_protocol() and ap_get_client_block() from silently
Graham Leggett [Wed, 15 May 2013 15:46:01 +0000 (15:46 +0000)]
core: Stop ap_finalize_request_protocol() and ap_get_client_block() from silently
swallowing errors from the filter stack, create error buckets and return them
appropriately.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482918 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_serf: Add a FIXME, we are using ap_get_client_block() incorrectly.
Graham Leggett [Wed, 15 May 2013 15:05:28 +0000 (15:05 +0000)]
mod_serf: Add a FIXME, we are using ap_get_client_block() incorrectly.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482883 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_proxy: Use a global mutex for handling workers.
Graham Leggett [Wed, 15 May 2013 14:13:15 +0000 (14:13 +0000)]
mod_proxy: Use a global mutex for handling workers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482859 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_proxy: Make sure we skip empty tokens when parsing the Connection
Graham Leggett [Tue, 14 May 2013 20:16:59 +0000 (20:16 +0000)]
mod_proxy: Make sure we skip empty tokens when parsing the Connection
header.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482555 13f79535-47bb-0310-9956-ffa450edef68

11 years agocore: Stop the HTTP_IN filter from attempting to write error buckets
Graham Leggett [Tue, 14 May 2013 18:58:06 +0000 (18:58 +0000)]
core: Stop the HTTP_IN filter from attempting to write error buckets
to the output filters, which is bogus in the proxy case. Create a
clean mapping from APR codes to HTTP status codes, and use it where
needed.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482522 13f79535-47bb-0310-9956-ffa450edef68

11 years agohunk 1: C89 please;
Guenter Knauf [Tue, 14 May 2013 01:53:53 +0000 (01:53 +0000)]
hunk 1: C89 please;
hunk 2: optional functions are usually declared static.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482170 13f79535-47bb-0310-9956-ffa450edef68

11 years agoNetWare build: make use of SVN revision optional.
Guenter Knauf [Tue, 14 May 2013 01:24:07 +0000 (01:24 +0000)]
NetWare build: make use of SVN revision optional.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482168 13f79535-47bb-0310-9956-ffa450edef68

11 years agoUse SVN revision for NetWare dev builds version info.
Guenter Knauf [Tue, 14 May 2013 00:51:01 +0000 (00:51 +0000)]
Use SVN revision for NetWare dev builds version info.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482160 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_proxy, mod_proxy_http: Connection headers must be stripped on the way
Graham Leggett [Mon, 13 May 2013 20:11:36 +0000 (20:11 +0000)]
mod_proxy, mod_proxy_http: Connection headers must be stripped on the way
in and out, support an optional function to handle this.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482075 13f79535-47bb-0310-9956-ffa450edef68

11 years agoMSVC 7, 8 & 9 use the .vcproj extension
Gregg Lewis Smith [Mon, 13 May 2013 19:29:01 +0000 (19:29 +0000)]
MSVC 7, 8 & 9 use the .vcproj extension
MSVC 10 & 11 use the .vcxproj extension
Apache.sln is common to all above versions

This allows proper detection and use of devenv in all these versions

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482041 13f79535-47bb-0310-9956-ffa450edef68

11 years agoMake AP_SERVER_ADD_STRING define-able from CFLAGS.
Guenter Knauf [Mon, 13 May 2013 16:30:04 +0000 (16:30 +0000)]
Make AP_SERVER_ADD_STRING define-able from CFLAGS.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481955 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_proxy: Ensure we don't attempt to amend a table we are iterating
Graham Leggett [Mon, 13 May 2013 14:45:49 +0000 (14:45 +0000)]
mod_proxy: Ensure we don't attempt to amend a table we are iterating
through, ensuring that all headers listed by Connection are removed.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481891 13f79535-47bb-0310-9956-ffa450edef68

11 years agoFixed include for Windows.
Guenter Knauf [Mon, 13 May 2013 00:36:41 +0000 (00:36 +0000)]
Fixed include for Windows.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481677 13f79535-47bb-0310-9956-ffa450edef68

11 years agoAdjust format string
Stefan Fritsch [Sat, 11 May 2013 19:58:03 +0000 (19:58 +0000)]
Adjust format string

type was changed by r1481302

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481397 13f79535-47bb-0310-9956-ffa450edef68

11 years agoupdate log tags
Stefan Fritsch [Sat, 11 May 2013 19:45:09 +0000 (19:45 +0000)]
update log tags

replace duplicate, add missing

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481396 13f79535-47bb-0310-9956-ffa450edef68

11 years agoRebuild
Rich Bowen [Sat, 11 May 2013 16:11:21 +0000 (16:11 +0000)]
Rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481366 13f79535-47bb-0310-9956-ffa450edef68

11 years agoThe use of "might" can leave some confusion as to whether it *is*.
Rich Bowen [Sat, 11 May 2013 16:08:23 +0000 (16:08 +0000)]
The use of "might" can leave some confusion as to whether it *is*.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481364 13f79535-47bb-0310-9956-ffa450edef68

11 years agoRebuild
Rich Bowen [Sat, 11 May 2013 15:58:48 +0000 (15:58 +0000)]
Rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481361 13f79535-47bb-0310-9956-ffa450edef68

11 years agoUse a more definitive tense.
Rich Bowen [Sat, 11 May 2013 15:52:31 +0000 (15:52 +0000)]
Use a more definitive tense.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481360 13f79535-47bb-0310-9956-ffa450edef68

11 years agoEncourage best practice of putting complex arguments in quotes.
Rich Bowen [Sat, 11 May 2013 15:51:24 +0000 (15:51 +0000)]
Encourage best practice of putting complex arguments in quotes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481359 13f79535-47bb-0310-9956-ffa450edef68

11 years agoPR54948: wildcard name-based vhosts printed twice in apachectl -S
Eric Covener [Sat, 11 May 2013 12:05:24 +0000 (12:05 +0000)]
PR54948: wildcard name-based vhosts printed twice in apachectl -S

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481306 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_proxy: Reject invalid values for Max-Forwards.
Graham Leggett [Sat, 11 May 2013 11:47:17 +0000 (11:47 +0000)]
mod_proxy: Reject invalid values for Max-Forwards.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481302 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_cache: If a 304 response indicates an entity not currently cached, then
Graham Leggett [Fri, 10 May 2013 21:40:54 +0000 (21:40 +0000)]
mod_cache: If a 304 response indicates an entity not currently cached, then
the cache MUST disregard the response and repeat the request without the
conditional.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481197 13f79535-47bb-0310-9956-ffa450edef68

11 years agoFixed NetWare default versions.
Guenter Knauf [Fri, 10 May 2013 15:40:25 +0000 (15:40 +0000)]
Fixed NetWare default versions.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481060 13f79535-47bb-0310-9956-ffa450edef68

11 years agoKill some NetWare build warnings.
Guenter Knauf [Fri, 10 May 2013 14:58:20 +0000 (14:58 +0000)]
Kill some NetWare build warnings.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481040 13f79535-47bb-0310-9956-ffa450edef68

11 years agoxforms (coincidentally, this is my 1111th commit, yay for palindromes!)
Daniel Gruno [Fri, 10 May 2013 08:20:58 +0000 (08:20 +0000)]
xforms (coincidentally, this is my 1111th commit, yay for palindromes!)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1480926 13f79535-47bb-0310-9956-ffa450edef68

11 years agosome more typos
Daniel Gruno [Fri, 10 May 2013 08:09:55 +0000 (08:09 +0000)]
some more typos

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1480915 13f79535-47bb-0310-9956-ffa450edef68

11 years agotypo and grammar fixes
Daniel Gruno [Fri, 10 May 2013 07:53:01 +0000 (07:53 +0000)]
typo and grammar fixes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1480904 13f79535-47bb-0310-9956-ffa450edef68

11 years agos/uppser/upper/
Daniel Gruno [Fri, 10 May 2013 07:47:43 +0000 (07:47 +0000)]
s/uppser/upper/

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1480901 13f79535-47bb-0310-9956-ffa450edef68

11 years agoRevert part of r1476482 which disabled fractions of seconds with r.sleep().
Guenter Knauf [Fri, 10 May 2013 03:37:06 +0000 (03:37 +0000)]
Revert part of r1476482 which disabled fractions of seconds with r.sleep().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1480871 13f79535-47bb-0310-9956-ffa450edef68

11 years agoMod_proxy used the global pool w/o mutex. fix.
Jim Jagielski [Thu, 9 May 2013 13:33:02 +0000 (13:33 +0000)]
Mod_proxy used the global pool w/o mutex. fix.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1480627 13f79535-47bb-0310-9956-ffa450edef68

11 years agoEnsure that Warning headers are correctly handled as per RFC2616.
Graham Leggett [Wed, 8 May 2013 14:06:48 +0000 (14:06 +0000)]
Ensure that Warning headers are correctly handled as per RFC2616.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1480283 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_proxy: Ensure network errors detected by the proxy are returned as
Graham Leggett [Tue, 7 May 2013 20:27:37 +0000 (20:27 +0000)]
mod_proxy: Ensure network errors detected by the proxy are returned as
504 Gateway Timout as opposed to 502 Bad Gateway, in order to be
compliant with RFC2616 14.9.4 Cache Revalidation and Reload Controls.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1480058 13f79535-47bb-0310-9956-ffa450edef68

11 years agoFix spelling mistake, no code change.
Graham Leggett [Tue, 7 May 2013 19:36:33 +0000 (19:36 +0000)]
Fix spelling mistake, no code change.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1480046 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_cache: Ensure that we don't attempt to replace a cached response
Graham Leggett [Tue, 7 May 2013 16:16:16 +0000 (16:16 +0000)]
mod_cache: Ensure that we don't attempt to replace a cached response
with an older response as per RFC2616 13.12.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1479966 13f79535-47bb-0310-9956-ffa450edef68

11 years agocore, mod_cache: Ensure RFC2616 compliance in ap_meets_conditions()
Graham Leggett [Tue, 7 May 2013 13:42:31 +0000 (13:42 +0000)]
core, mod_cache: Ensure RFC2616 compliance in ap_meets_conditions()
with weak validation combined with If-Range and Range headers. Break
out explicit conditional header checks to be useable elsewhere in the
server. Ensure weak validation RFC compliance in the byteranges filter.
Ensure RFC validation compliance when serving cached entities. PR 16142

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1479905 13f79535-47bb-0310-9956-ffa450edef68

11 years agoupdate french translation to reflect the current auth syntax
Daniel Gruno [Tue, 7 May 2013 13:27:15 +0000 (13:27 +0000)]
update french translation to reflect the current auth syntax

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1479902 13f79535-47bb-0310-9956-ffa450edef68

11 years agobring perf scaling into the 21st century (s/allow from all/require all granted/).
Daniel Gruno [Tue, 7 May 2013 13:23:44 +0000 (13:23 +0000)]
bring perf scaling into the 21st century (s/allow from all/require all granted/).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1479900 13f79535-47bb-0310-9956-ffa450edef68

11 years agoxforms
Daniel Gruno [Tue, 7 May 2013 12:13:43 +0000 (12:13 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1479876 13f79535-47bb-0310-9956-ffa450edef68

11 years agoCatch up with the actual modern way of allowing/denying access
Daniel Gruno [Tue, 7 May 2013 12:07:03 +0000 (12:07 +0000)]
Catch up with the actual modern way of allowing/denying access

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1479872 13f79535-47bb-0310-9956-ffa450edef68

11 years agoxforms
Daniel Gruno [Tue, 7 May 2013 11:51:45 +0000 (11:51 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1479868 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_macro is no longer a third party module.
Daniel Gruno [Tue, 7 May 2013 11:44:15 +0000 (11:44 +0000)]
mod_macro is no longer a third party module.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1479865 13f79535-47bb-0310-9956-ffa450edef68

11 years agolua header update part 1: EDOESNOTBUILD.
Rainer Jung [Mon, 6 May 2013 23:23:43 +0000 (23:23 +0000)]
lua header update part 1: EDOESNOTBUILD.

First include mod_lua which sets LUA_COMPAT_ALL,
then lua.h which uses it.

Needed at least to build with lua 5.2.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1479718 13f79535-47bb-0310-9956-ffa450edef68

11 years agocore: Add the ability to do explicit matching on weak and strong ETags
Graham Leggett [Mon, 6 May 2013 11:41:10 +0000 (11:41 +0000)]
core: Add the ability to do explicit matching on weak and strong ETags
as per RFC2616 Section 13.3.3.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1479528 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_cache: Ensure that updated responses to HEAD requests don't get
Graham Leggett [Sun, 5 May 2013 22:27:31 +0000 (22:27 +0000)]
mod_cache: Ensure that updated responses to HEAD requests don't get
mistakenly paired with a previously cached body. Ensure that any existing
body is removed when a HEAD request is cached.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1479411 13f79535-47bb-0310-9956-ffa450edef68

11 years agotypo fix
Daniel Gruno [Sun, 5 May 2013 08:42:39 +0000 (08:42 +0000)]
typo fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1479264 13f79535-47bb-0310-9956-ffa450edef68