]> granicus.if.org Git - apache/log
apache
9 years agomod_alias: Introduce expression parser support for Alias, ScriptAlias
Graham Leggett [Thu, 22 Jan 2015 17:02:22 +0000 (17:02 +0000)]
mod_alias: Introduce expression parser support for Alias, ScriptAlias
and Redirect.

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

9 years agoFix merge problem with SSLProtocol that made SSLProtocol ALL ignored
Eric Covener [Thu, 22 Jan 2015 15:19:39 +0000 (15:19 +0000)]
Fix merge problem with SSLProtocol that made SSLProtocol ALL ignored
in virtualhost context.

Submitted By: Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>
Commited By: covener

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

9 years agoBump mmn as documented in commit log msg r1653666
William A. Rowe Jr [Wed, 21 Jan 2015 21:42:36 +0000 (21:42 +0000)]
Bump mmn as documented in commit log msg r1653666

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

9 years agoRevert r4635428 corresponding to PR41867.
William A. Rowe Jr [Wed, 21 Jan 2015 21:39:55 +0000 (21:39 +0000)]
Revert r4635428 corresponding to PR41867.

The code reverted attempted to restrict comparisons of the r->filename
to given DirectoryMatch blocks.

r->filename was already a non-directory entity at this point, because we
have already fallen out of the } while (thisinfo.filetype == APR_DIR);
block above.

The addition of r->d_is_directory was redundant.  That is what is always
returned by ap_get_core_module_config(r->per_dir_config).

Note modifying dir_config required an MMN major bump as this commit could
have realigned the offset of refs (had it been added to the end, this
would correspond to an mmn minor bump) and other fields packed into the
same bytes (this is undefined). Bump on revert to prevent unexpected crashes.

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

9 years agoRemove the bitfield spec from the http_ctx_t.state enum
Eric Covener [Wed, 21 Jan 2015 14:09:49 +0000 (14:09 +0000)]
Remove the bitfield spec from the http_ctx_t.state enum
as it causes an error-prone mismatch between the enum values and the
state values.  Caused a busy loop in windows.

Added in r1484852 and trunk-only.

Submitted By: Edward Lu, Yann Ylavic
Committed By: covener

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

9 years agoFix indentation and tab use after r1652955.
Rainer Jung [Mon, 19 Jan 2015 12:42:41 +0000 (12:42 +0000)]
Fix indentation and tab use after r1652955.

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

9 years agoAddition to r1652955: Use "=" in combination
Rainer Jung [Mon, 19 Jan 2015 12:34:29 +0000 (12:34 +0000)]
Addition to r1652955: Use "=" in combination
with "test" instead of "==".

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

9 years agoFix detection of old Solaris versions.
Rainer Jung [Mon, 19 Jan 2015 12:22:34 +0000 (12:22 +0000)]
Fix detection of old Solaris versions.
Autotools need double square brackets.

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

9 years agoPR 57379: If mod_cgi and mod_cgid get installed,
Rainer Jung [Mon, 19 Jan 2015 10:32:51 +0000 (10:32 +0000)]
PR 57379: If mod_cgi and mod_cgid get installed,
use IfModule for MPM to LoadModule mod_cgi for
prefork and mod_cgid for all other MPMs.

Previously when combined with --enable-load-all-modules
both modules were loaded and it was undefined
which one actually handled cgi requests.

Based on a patch by olli hauer <ohauer gmx.de>.

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

9 years agoGenerate #LoadModule directive in default httpd.conf for every --enable-mpms-shared...
Yann Ylavic [Mon, 19 Jan 2015 08:14:48 +0000 (08:14 +0000)]
Generate #LoadModule directive in default httpd.conf for every --enable-mpms-shared. PR 53882.
Submitted by: olli hauer <ohauer gmx.de>
Committed by: ylavic

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

9 years agoFix --enable-v4-mapped configuration on *BSD. PR 53824.
Yann Ylavic [Mon, 19 Jan 2015 08:06:56 +0000 (08:06 +0000)]
Fix --enable-v4-mapped configuration on *BSD. PR 53824.
Submitted by: olli hauer <ohauer gmx.de>
Committed by: ylavic

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

9 years agoEnable to build mod_lua against Lua 5.3.
Guenter Knauf [Mon, 19 Jan 2015 00:35:25 +0000 (00:35 +0000)]
Enable to build mod_lua against Lua 5.3.

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

9 years agoNetWare build: fix problem with NLM version.
Guenter Knauf [Sun, 18 Jan 2015 23:38:20 +0000 (23:38 +0000)]
NetWare build: fix problem with NLM version.

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

9 years agoSilence compiler warnings:
Rainer Jung [Sun, 18 Jan 2015 18:57:53 +0000 (18:57 +0000)]
Silence compiler warnings:

- modules/aaa/mod_authnz_fcgi.c:705: warning:
  'orspbuflen' may be used uninitialized in this function

- modules/aaa/mod_authnz_fcgi.c:1235: warning:
  comparison is always false due to limited range of data type

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

9 years agoRebuild.
Lucien Gentis [Sat, 17 Jan 2015 15:55:10 +0000 (15:55 +0000)]
Rebuild.

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

9 years agoXML updates.
Lucien Gentis [Sat, 17 Jan 2015 15:54:06 +0000 (15:54 +0000)]
XML updates.

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

9 years agomod_rewrite: Improve 'bad flag delimeters' startup error by showing
Eric Covener [Fri, 16 Jan 2015 19:43:30 +0000 (19:43 +0000)]
mod_rewrite: Improve 'bad flag delimeters' startup error by showing
how the input was tokenized.  PR 56528.

Submitted By: Edward Lu <Chaosed0 gmail.com>
Committed By: covener

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

9 years agoxforms
Eric Covener [Fri, 16 Jan 2015 13:23:14 +0000 (13:23 +0000)]
xforms

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

9 years agocomments feedback -- it's an initial _request_
Eric Covener [Fri, 16 Jan 2015 13:21:34 +0000 (13:21 +0000)]
comments feedback -- it's an initial _request_

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

9 years agobackported
Jim Jagielski [Wed, 14 Jan 2015 13:31:57 +0000 (13:31 +0000)]
backported

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

9 years agobackported
Jim Jagielski [Wed, 14 Jan 2015 13:30:31 +0000 (13:30 +0000)]
backported

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

9 years agoupdate transforms
Rich Bowen [Tue, 13 Jan 2015 20:46:54 +0000 (20:46 +0000)]
update transforms

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

9 years agoInsert .htaccess example talking about relative paths when using
Rich Bowen [Tue, 13 Jan 2015 20:39:34 +0000 (20:39 +0000)]
Insert .htaccess example talking about relative paths when using
mod_rewrite in .htaccess files.

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

9 years agoBackported
Jim Jagielski [Tue, 13 Jan 2015 13:54:17 +0000 (13:54 +0000)]
Backported

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

9 years agor1651088 for eventopt
Eric Covener [Mon, 12 Jan 2015 13:45:30 +0000 (13:45 +0000)]
r1651088 for eventopt

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

9 years agoUpdate conn_rec.id when a new thread begins working on a connection, because
Eric Covener [Mon, 12 Jan 2015 13:42:31 +0000 (13:42 +0000)]
Update conn_rec.id when a new thread begins working on a connection, because
the old thread may work on a new connection and assign the same ID in parallel.

Submitted By:  Michael Thorpe
Committed By: covener

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

9 years agoRebuild.
Lucien Gentis [Sat, 10 Jan 2015 16:09:17 +0000 (16:09 +0000)]
Rebuild.

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

9 years agoXML update.
Lucien Gentis [Sat, 10 Jan 2015 16:07:26 +0000 (16:07 +0000)]
XML update.

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

9 years ago* modules/dav/main/config.m4: Remove long-redundant expat reference.
Joe Orton [Fri, 9 Jan 2015 10:24:28 +0000 (10:24 +0000)]
* modules/dav/main/config.m4: Remove long-redundant expat reference.

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

9 years agoXforms.
Rainer Jung [Thu, 8 Jan 2015 16:24:28 +0000 (16:24 +0000)]
Xforms.

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

9 years agoFix copy and paste error in docs of new feature.
Rainer Jung [Thu, 8 Jan 2015 16:13:55 +0000 (16:13 +0000)]
Fix copy and paste error in docs of new feature.

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

9 years agoXforms.
Rainer Jung [Thu, 8 Jan 2015 15:36:43 +0000 (15:36 +0000)]
Xforms.

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

9 years agoAdd SSLSessionTickets (on|off).
Rainer Jung [Thu, 8 Jan 2015 15:34:10 +0000 (15:34 +0000)]
Add SSLSessionTickets (on|off).

It controls the use of TLS session tickets
(RFC 5077). Default is unchanged (on).

Using session tickets without restarting
the web server with an appropriate frequency
(e.g. daily) compromises perfect forward
secrecy.

As long as we do not have a nice key management
there should be a way to deactivate session
tickets.

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

9 years agosave some bytes per Christophe's review.
Eric Covener [Thu, 8 Jan 2015 15:28:48 +0000 (15:28 +0000)]
save some bytes per Christophe's review.

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

9 years agomod_ssl: follow up to r1601919.
Yann Ylavic [Wed, 7 Jan 2015 14:20:57 +0000 (14:20 +0000)]
mod_ssl: follow up to r1601919.
Likewise when set from SNI callback.

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

9 years agoupdate mod_ssl.html.en transformation
Kaspar Brand [Wed, 7 Jan 2015 12:27:00 +0000 (12:27 +0000)]
update mod_ssl.html.en transformation

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

9 years agoAdd support for extracting subjectAltName entries of type
Kaspar Brand [Wed, 7 Jan 2015 12:24:48 +0000 (12:24 +0000)]
Add support for extracting subjectAltName entries of type
rfc822Name and dNSName into SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n
variables.

* docs/manual/mod/mod_ssl.xml: add SSL_*_SAN_*_n entries to the
  environment variables table

* modules/ssl/ssl_engine_kernel.c: in ssl_hook_Fixup, add extraction
  of subjectAltName entries for the "StdEnvVars" case

* modules/ssl/ssl_engine_vars.c: add support for retrieving the
  SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n variables, either with
  individual on-demand lookup (ssl_var_lookup_ssl_cert_san),
  or with full-list extraction to the environment ("StdEnvVars")

* modules/ssl/ssl_private.h: add modssl_var_extract_san_entries prototype

* modules/ssl/ssl_util_ssl.c: implement SSL_X509_getSAN and
  SSL_ASN1_STRING_to_utf8 helper functions, with factoring out common
  code from SSL_X509_getIDs and SSL_X509_NAME_ENTRY_to_string where
  suitable. Limit SSL_X509_getSAN to the two most common subjectAltName
  entry types appearing in user or server certificates (i.e., rfc822Name
  and dNSName), for the time being.

* modules/ssl/ssl_util_ssl.h: add SSL_ASN1_STRING_to_utf8
  and SSL_X509_getSAN prototypes

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

9 years agomod_proxy: Don't put non balancer-member workers in error state by
Yann Ylavic [Wed, 7 Jan 2015 10:36:12 +0000 (10:36 +0000)]
mod_proxy: Don't put non balancer-member workers in error state by
default for connection or 500/503 errors, and honor status=+I for
any error.  PR 48388.

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

9 years agoAdd CHANGE for r1649632
Christophe Jaillet [Tue, 6 Jan 2015 22:56:02 +0000 (22:56 +0000)]
Add CHANGE for r1649632

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

9 years agoAdd PR
Christophe Jaillet [Tue, 6 Jan 2015 22:46:34 +0000 (22:46 +0000)]
Add PR

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

9 years agoAdd missing 'filemod' in functions list + minor formatting issue + long line split
Christophe Jaillet [Mon, 5 Jan 2015 20:03:50 +0000 (20:03 +0000)]
Add missing 'filemod' in functions list + minor formatting issue + long line split

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

9 years agoBe consistant with the code below which accepts lower or upper case.
Christophe Jaillet [Mon, 5 Jan 2015 19:53:35 +0000 (19:53 +0000)]
Be consistant with the code below which accepts lower or upper case.

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

9 years ago* modules/cache/mod_socache_memcache.c (socache_mc_store): Pass
Joe Orton [Mon, 5 Jan 2015 10:06:29 +0000 (10:06 +0000)]
* modules/cache/mod_socache_memcache.c (socache_mc_store): Pass
  through expiration time.

Submitted by: Faidon Liambotis <paravoid debian.org>, jorton

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

9 years agoRebuild.
Lucien Gentis [Sun, 4 Jan 2015 14:10:06 +0000 (14:10 +0000)]
Rebuild.

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

9 years agoXML update.
Lucien Gentis [Sun, 4 Jan 2015 14:09:16 +0000 (14:09 +0000)]
XML update.

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

9 years agoRebuild.
Lucien Gentis [Sun, 4 Jan 2015 14:06:00 +0000 (14:06 +0000)]
Rebuild.

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

9 years agoXML update.
Lucien Gentis [Sun, 4 Jan 2015 14:04:34 +0000 (14:04 +0000)]
XML update.

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

9 years agoRebuild.
Lucien Gentis [Sun, 4 Jan 2015 13:43:21 +0000 (13:43 +0000)]
Rebuild.

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

9 years agoXML update.
Lucien Gentis [Sun, 4 Jan 2015 13:40:37 +0000 (13:40 +0000)]
XML update.

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

9 years agoXML update.
Lucien Gentis [Sun, 4 Jan 2015 13:38:28 +0000 (13:38 +0000)]
XML update.

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

9 years agoRebuild.
Lucien Gentis [Sun, 4 Jan 2015 13:28:54 +0000 (13:28 +0000)]
Rebuild.

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

9 years agoXML update.
Lucien Gentis [Sun, 4 Jan 2015 13:27:14 +0000 (13:27 +0000)]
XML update.

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

9 years agoXML update.
Lucien Gentis [Sun, 4 Jan 2015 13:23:16 +0000 (13:23 +0000)]
XML update.

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

9 years agoRebuild.
Lucien Gentis [Sat, 3 Jan 2015 15:37:54 +0000 (15:37 +0000)]
Rebuild.

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

9 years agoXML update.
Lucien Gentis [Sat, 3 Jan 2015 15:36:48 +0000 (15:36 +0000)]
XML update.

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

9 years agomod_proxy_ajp: Fix get_content_length().
Rainer Jung [Fri, 2 Jan 2015 14:28:39 +0000 (14:28 +0000)]
mod_proxy_ajp: Fix get_content_length().

clength in request_rec is for response sizes,
not request body size. It is initialized to 0,
so the "if" branch was never taken.

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

9 years agoXforms.
Rainer Jung [Fri, 2 Jan 2015 11:42:59 +0000 (11:42 +0000)]
Xforms.

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

9 years agoPR 48460: Improve/correct mod_proxy_ajp docs.
Rainer Jung [Fri, 2 Jan 2015 11:36:45 +0000 (11:36 +0000)]
PR 48460: Improve/correct mod_proxy_ajp docs.

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

9 years agoAdd a hint about how CONNECT-method requests are filtered out by <Proxy>,
Fabien Coelho [Thu, 1 Jan 2015 13:56:40 +0000 (13:56 +0000)]
Add a hint about how CONNECT-method requests are filtered out by <Proxy>,
and how to enable them. I could not find this information easily.

In particular, the straightforward <Proxy https://www.example.com>... does
not allow CONNECT to the corresponding SSL server. Probably it would work
if a web client sent a "GET https://www.example.com/ HTTP/1.1" to the
proxy, but none would do that.

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

9 years agoRegenerate xforms after s/2014/2015/
Rainer Jung [Thu, 1 Jan 2015 13:48:56 +0000 (13:48 +0000)]
Regenerate xforms after s/2014/2015/

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

9 years agoHappy New Year 2015
Rainer Jung [Thu, 1 Jan 2015 13:05:30 +0000 (13:05 +0000)]
Happy New Year 2015

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

9 years agosplit-logfile: Fix perl error: 'Can't use string ("example.org:80")
Eric Covener [Wed, 31 Dec 2014 15:39:02 +0000 (15:39 +0000)]
split-logfile: Fix perl error:  'Can't use string ("example.org:80")
  as a symbol ref while "strict refs"'. PR 56329.

Submitted By: Holger Mauermann <mauermann gmail.com>
Committed By: covener

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

9 years agoFix some spelling errors in mod_proxy_fcgi comments.
Mike Rumph [Tue, 30 Dec 2014 17:43:59 +0000 (17:43 +0000)]
Fix some spelling errors in mod_proxy_fcgi comments.

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

9 years agoPR 56603: Inappropiate ProxyPassReverse match when interpolated URL
Eric Covener [Mon, 29 Dec 2014 21:05:56 +0000 (21:05 +0000)]
PR 56603:  Inappropiate ProxyPassReverse match when interpolated URL
is empty string

Submitted By: <ajprout hotmail.com>
Committed By: covener

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

9 years agos/BitNami/Bitnami/
Rich Bowen [Mon, 29 Dec 2014 20:04:52 +0000 (20:04 +0000)]
s/BitNami/Bitnami/

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

9 years agoConfiguration files with long lines and continuation characters
Eric Covener [Mon, 29 Dec 2014 17:27:46 +0000 (17:27 +0000)]
Configuration files with long lines and continuation characters
are not read properly. PR 55910.

Submitted By: Manuel Mausz <manuel-as mausz.at>
Committed By: covener

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

9 years agoRebuild.
Lucien Gentis [Sun, 28 Dec 2014 14:57:01 +0000 (14:57 +0000)]
Rebuild.

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

9 years agoXML updates.
Lucien Gentis [Sun, 28 Dec 2014 14:55:39 +0000 (14:55 +0000)]
XML updates.

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

9 years agoAdd class attributes for empty descriptions
Daniel Ruggeri [Sun, 28 Dec 2014 13:43:25 +0000 (13:43 +0000)]
Add class attributes for empty descriptions

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

9 years agoChange the return value to const, so the const non-matching input can just be
Eric Covener [Mon, 22 Dec 2014 15:39:54 +0000 (15:39 +0000)]
Change the return value to const, so the const non-matching input can just be
returned.

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

9 years agosome tweaks for no ServerName from PR57384
Eric Covener [Mon, 22 Dec 2014 00:44:01 +0000 (00:44 +0000)]
some tweaks for no ServerName from PR57384

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

9 years agoRebuild.
Lucien Gentis [Sun, 21 Dec 2014 16:53:20 +0000 (16:53 +0000)]
Rebuild.

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

9 years agoXML updates.
Lucien Gentis [Sun, 21 Dec 2014 16:52:07 +0000 (16:52 +0000)]
XML updates.

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

9 years agoxforms
Eric Covener [Sun, 21 Dec 2014 15:32:51 +0000 (15:32 +0000)]
xforms

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

9 years agofix path as well
Eric Covener [Sun, 21 Dec 2014 15:30:52 +0000 (15:30 +0000)]
fix path as well

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

9 years agofix anchor to #workers
Eric Covener [Sun, 21 Dec 2014 15:28:41 +0000 (15:28 +0000)]
fix anchor to #workers

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

9 years agolooks like debug left in r1642154
Eric Covener [Sun, 21 Dec 2014 11:47:26 +0000 (11:47 +0000)]
looks like debug left in r1642154

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

9 years agoprovide alternative PATH_INFO calculation options for proxy_fcgi.
Eric Covener [Sat, 20 Dec 2014 18:45:23 +0000 (18:45 +0000)]
provide alternative PATH_INFO calculation options for proxy_fcgi.
PR 55329

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

9 years agoxforms
Eric Covener [Sat, 20 Dec 2014 16:07:56 +0000 (16:07 +0000)]
xforms

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

9 years agoPATH_INFO is set for free when we use SetHandler style configuration,
Eric Covener [Sat, 20 Dec 2014 16:07:34 +0000 (16:07 +0000)]
PATH_INFO is set for free when we use SetHandler style configuration,
because we have already directory walked.

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

9 years agoshow a worker+uds+sethandler configuration
Eric Covener [Sat, 20 Dec 2014 16:02:25 +0000 (16:02 +0000)]
show a worker+uds+sethandler configuration

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

9 years agotypo and formatting
Eric Covener [Sat, 20 Dec 2014 15:56:38 +0000 (15:56 +0000)]
typo and formatting

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

9 years agoAllow SetHandler+UDS+fcgi to take advantage of dedicated workers including
Eric Covener [Sat, 20 Dec 2014 15:56:16 +0000 (15:56 +0000)]
Allow SetHandler+UDS+fcgi to take advantage of dedicated workers including
opting in to connection reuse and other proxy options (max=, etc).

adds 'enablereuse' proxyoption and a minor MMN bump to share
proxy_desocketfy outside of mod_proxy.c, which is required to
match workers to URLs.

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

9 years agoxforms
Eric Covener [Sat, 20 Dec 2014 15:38:35 +0000 (15:38 +0000)]
xforms

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

9 years agoAllow (a hokey) opt-in to connection reuse for mod_proxy_fcgi + TCP.
Eric Covener [Sat, 20 Dec 2014 15:38:27 +0000 (15:38 +0000)]
Allow (a hokey) opt-in to connection reuse for mod_proxy_fcgi + TCP.

Connection reuse has been disabled since r1032345 at the end of
2011.

Attempt to reverse the polarity of the connection reuse doc which
has been wrong for a long time.

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

9 years agoxforms
Eric Covener [Fri, 19 Dec 2014 23:42:12 +0000 (23:42 +0000)]
xforms

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

9 years agoadd more examples, mention one reason to use SetHandler.
Eric Covener [Fri, 19 Dec 2014 23:41:58 +0000 (23:41 +0000)]
add more examples, mention one reason to use SetHandler.

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

9 years agotweak SCRIPT_FILENAME passed to fastcgi backends when a balancer is used.
Eric Covener [Fri, 19 Dec 2014 14:03:52 +0000 (14:03 +0000)]
tweak SCRIPT_FILENAME passed to fastcgi backends when a balancer is used.

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

9 years agoFix example as spotted in a comment in online doc.
Christophe Jaillet [Thu, 18 Dec 2014 06:57:38 +0000 (06:57 +0000)]
Fix example as spotted in a comment in online doc.

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

9 years ago* Fix If-Match handling:
Ruediger Pluem [Wed, 17 Dec 2014 15:39:15 +0000 (15:39 +0000)]
* Fix If-Match handling:
  - We need to fail if we do NOT match.
  - ETag comparison only makes sense if we have an ETag

PR: 57358
Submitted by: Kunihiko Sakamoto <ksakamoto google.com>
Reviewed by: rpluem

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

9 years agoin 2.4
Jim Jagielski [Tue, 16 Dec 2014 13:09:42 +0000 (13:09 +0000)]
in 2.4

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

9 years agoFix command line parameters as spotted in a comment in the online doc.
Christophe Jaillet [Tue, 16 Dec 2014 07:12:52 +0000 (07:12 +0000)]
Fix command line parameters as spotted in a comment in the online doc.
Thx alfonz.

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

9 years ago* Return NULL instead of an empty string as ssl_var_lookup_ssl does by default. Thank...
Ruediger Pluem [Mon, 15 Dec 2014 14:57:52 +0000 (14:57 +0000)]
* Return NULL instead of an empty string as ssl_var_lookup_ssl does by default. Thanks for the pointer Christophe

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

9 years agoFix extraction of an SCT list from a stapled OCSP response.
Jeff Trawick [Mon, 15 Dec 2014 01:37:40 +0000 (01:37 +0000)]
Fix extraction of an SCT list from a stapled OCSP response.

The hard-coded 2 byte offset to get to the list (in lieu of
the proper logic) didn't survive the addition of the SCT
from an additional log.

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

9 years agossl_io_filter_handshake(): When a post-handshake check fails,
Jeff Trawick [Sun, 14 Dec 2014 21:48:25 +0000 (21:48 +0000)]
ssl_io_filter_handshake(): When a post-handshake check fails,
return an error code understood by ssl_io_filter_error().

That function needs to perform error handling, and a valid
apr_status_t needs to be returned up.

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

9 years agomod_proxy: don't add the default port to the name of proxy workers. PR 57259.
Yann Ylavic [Wed, 10 Dec 2014 18:45:24 +0000 (18:45 +0000)]
mod_proxy: don't add the default port to the name of proxy workers. PR 57259.
ap_proxy_port_of_scheme() knows more default ports than apr_unparse_uri().

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

9 years ago* mod_ssl: Fix renegotiation failures redirected to an ErrorDocument. PR 57334.
Yann Ylavic [Wed, 10 Dec 2014 18:06:55 +0000 (18:06 +0000)]
* mod_ssl: Fix renegotiation failures redirected to an ErrorDocument. PR 57334.

When this occurs, the redirect (internal) request reaches ssl_hook_Access()
and make SSL_do_handshake crash probably because we force the renegotiation
based on an incomplete SSL state.

To avoid this, ssl_hook_Access() now returns FORBIDDEN immediatly if the given
SSL connection is not in a valid (handshaken) state.

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

9 years agoAdded include path for Windows build.
Gregg Lewis Smith [Tue, 9 Dec 2014 23:55:22 +0000 (23:55 +0000)]
Added include path for Windows build.

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

9 years ago* mod_proxy_fcgi: Follow up to r1640495. Ignore body data from backend
Jan Kaluža [Tue, 9 Dec 2014 11:39:57 +0000 (11:39 +0000)]
* mod_proxy_fcgi: Follow up to r1640495. Ignore body data from backend
for 304 responses also when read with the header.

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

9 years agobackported in r1642861
Eric Covener [Tue, 9 Dec 2014 01:55:52 +0000 (01:55 +0000)]
backported in r1642861

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