diff options
| author | Christophe Jaillet <jailletc36@apache.org> | 2015-02-24 06:22:22 +0000 |
|---|---|---|
| committer | Christophe Jaillet <jailletc36@apache.org> | 2015-02-24 06:22:22 +0000 |
| commit | 99d7794f20fd4034c8a6985631d46973fe658e23 (patch) | |
| tree | 1c2658508e1753e3ac7c8bc431d28d3739934ae7 /modules/ssl | |
| parent | 3ce19fcfbbb32b8cdc8c7230017e26ea872b2052 (diff) | |
| download | httpd-99d7794f20fd4034c8a6985631d46973fe658e23.tar.gz | |
Merge r1611979, r1611725, r1588448, r1642803, r1657949, r1451108 (part of it),
r1643672, r1496178 from trunk
* Synch with trunk:
- Add missing APLOGNO.
- mod_deflate: don't require <limits.h> by using APR_INT32_MAX instead of INT_MAX.
- Move two variable assignments off the fast path.
- Fix curly braces style. Remove useless empty lines
- tab vs space
- Removed tabs.
- dump fcgi headers with trace8 instead of debug+compile-time flag.
- Drop severity of "LDAP: Setting referrals to ON" from DEBUG to TRACE4
Submitted by: jailletc36, ylavic, minfrin, fuankg, covener
Reviewed by: jailletc36, minfrin, ylavic
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1661845 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl')
| -rw-r--r-- | modules/ssl/mod_ssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c index 63852d076e..8d47d1f0eb 100644 --- a/modules/ssl/mod_ssl.c +++ b/modules/ssl/mod_ssl.c @@ -270,7 +270,7 @@ static const command_rec ssl_config_cmds[] = { #ifdef HAVE_SSL_CONF_CMD SSL_CMD_SRV(OpenSSLConfCmd, TAKE2, - "OpenSSL configuration command") + "OpenSSL configuration command") #endif /* Deprecated directives. */ |