Commit Graph

26860 Commits

Author SHA1 Message Date
95d663edf3 Improve r1525489 (one line with a "-" was forgotten) and synch with 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1655141 13f79535-47bb-0310-9956-ffa450edef68
2015-01-27 20:02:36 +00:00
09a839dd94 Fix doc as spotted by mebjas.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654984 13f79535-47bb-0310-9956-ffa450edef68
2015-01-27 07:21:07 +00:00
fd92456cd2 Fix doc as spotted by mrskman.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654983 13f79535-47bb-0310-9956-ffa450edef68
2015-01-27 07:11:37 +00:00
97f708ce4f xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654832 13f79535-47bb-0310-9956-ffa450edef68
2015-01-26 16:00:06 +00:00
8b65ae7f3c comment feedback -- flow is confusing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654831 13f79535-47bb-0310-9956-ffa450edef68
2015-01-26 15:59:59 +00:00
2544334de1 XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654543 13f79535-47bb-0310-9956-ffa450edef68
2015-01-24 15:29:04 +00:00
de3beb11e9 Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654528 13f79535-47bb-0310-9956-ffa450edef68
2015-01-24 14:53:56 +00:00
5a6c449afb XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654527 13f79535-47bb-0310-9956-ffa450edef68
2015-01-24 14:52:30 +00:00
8dd6f463ed as in r1517366, drop the severity in authz_groupfile when a require
didn't match but no real error was encountered. 

This individual 'require group' may not really dictate who gets in. PR55523 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654184 13f79535-47bb-0310-9956-ffa450edef68
2015-01-23 12:21:34 +00:00
a365a65513 mod_ssl: Fix merge problem with SSLProtocol that made SSLProtocol ALL ignored
in virtualhost context (new version of r1653906 reverted by r1653993).

Submitted By: Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>
Committed/modified By: ylavic



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1653997 13f79535-47bb-0310-9956-ffa450edef68
2015-01-22 18:37:06 +00:00
4c52577a7f mod_ssl: revert r1653906, will commit an alternative just after.
The issue with r1653906 is that existing configurations like
"SSLProtocol -SSLv3" (where the default is assumed to be ALL)
won't work anymore.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1653993 13f79535-47bb-0310-9956-ffa450edef68
2015-01-22 18:27:46 +00:00
7e120c114b Use unsigned bit fields.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1653978 13f79535-47bb-0310-9956-ffa450edef68
2015-01-22 18:06:57 +00:00
5488d21243 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
2015-01-22 17:02:22 +00:00
6d6a8a16f1 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
2015-01-22 15:19:39 +00:00
09a7ffc55d 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
2015-01-21 21:42:36 +00:00
0271656a56 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
2015-01-21 21:39:55 +00:00
ce217cfc64 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
2015-01-21 14:09:49 +00:00
ff489513c8 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
2015-01-19 12:42:41 +00:00
4822ab9bd3 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
2015-01-19 12:34:29 +00:00
df2e9f3ba4 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
2015-01-19 12:22:34 +00:00
faac8c0c52 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
2015-01-19 10:32:51 +00:00
07605b2bad 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
2015-01-19 08:14:48 +00:00
9773787f37 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
2015-01-19 08:06:56 +00:00
53e7998820 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
2015-01-19 00:35:25 +00:00
2f57f9208d 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
2015-01-18 23:38:20 +00:00
642b344069 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
2015-01-18 18:57:53 +00:00
d9c744bd0e Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1652630 13f79535-47bb-0310-9956-ffa450edef68
2015-01-17 15:55:10 +00:00
0872ca5ed2 XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1652629 13f79535-47bb-0310-9956-ffa450edef68
2015-01-17 15:54:06 +00:00
e6250a9198 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
2015-01-16 19:43:30 +00:00
2a568ceb74 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1652403 13f79535-47bb-0310-9956-ffa450edef68
2015-01-16 13:23:14 +00:00
5ef57e8a41 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
2015-01-16 13:21:34 +00:00
647d9c6d24 backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1651666 13f79535-47bb-0310-9956-ffa450edef68
2015-01-14 13:31:57 +00:00
cda75c6303 backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1651664 13f79535-47bb-0310-9956-ffa450edef68
2015-01-14 13:30:31 +00:00
fa57b27d95 update transforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1651485 13f79535-47bb-0310-9956-ffa450edef68
2015-01-13 20:46:54 +00:00
7a323fe796 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
2015-01-13 20:39:34 +00:00
6ef6dc6a43 Backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1651343 13f79535-47bb-0310-9956-ffa450edef68
2015-01-13 13:54:17 +00:00
48d36db55b r1651088 for eventopt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1651089 13f79535-47bb-0310-9956-ffa450edef68
2015-01-12 13:45:30 +00:00
8197971bce 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
2015-01-12 13:42:31 +00:00
395102d68f Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1650763 13f79535-47bb-0310-9956-ffa450edef68
2015-01-10 16:09:17 +00:00
7efd1a6915 XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1650762 13f79535-47bb-0310-9956-ffa450edef68
2015-01-10 16:07:26 +00:00
0b73b47e98 * 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
2015-01-09 10:24:28 +00:00
19ba12ce42 Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1650322 13f79535-47bb-0310-9956-ffa450edef68
2015-01-08 16:24:28 +00:00
d5365fa8df 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
2015-01-08 16:13:55 +00:00
db7e679971 Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1650311 13f79535-47bb-0310-9956-ffa450edef68
2015-01-08 15:36:43 +00:00
bf93fed8a1 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
2015-01-08 15:34:10 +00:00
a8afe6572f 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
2015-01-08 15:28:48 +00:00
7839a61951 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
2015-01-07 14:20:57 +00:00
7ce318b1d0 update mod_ssl.html.en transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1650048 13f79535-47bb-0310-9956-ffa450edef68
2015-01-07 12:27:00 +00:00
9660add80a 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
2015-01-07 12:24:48 +00:00
1f6fd365c3 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
2015-01-07 10:36:12 +00:00