← Back to branch summary

~ubuntu-branches/ubuntu/maverick/apache2/maverick

« back to all changes in this revision

Viewing changes to modules/ssl/ssl_private.h

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-07-26 20:21:37 UTC
  • mfrom: (14.3.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100726202137-rctltspkiazb40z1
Tags: 2.2.16-1ubuntu1
https://launchpad.net/bugs/456381
* Merge from debian unstable.  Remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree.
  - debian/apache2-2.common.apache2.init: Add graceful restart (LP: #456381)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/ssl/ssl_private.h
479
479
#ifndef OPENSSL_NO_TLSEXT
480
480
    ssl_enabled_t    strict_sni_vhost_check;
481
481
#endif
 
482
#ifdef HAVE_FIPS
 
483
    BOOL             fips;
 
484
#endif
482
485
};
483
486
 
484
487
/**
562
565
const char  *ssl_cmd_SSLProxyCheckPeerExpire(cmd_parms *cmd, void *dcfg, int flag);
563
566
const char  *ssl_cmd_SSLProxyCheckPeerCN(cmd_parms *cmd, void *dcfg, int flag);
564
567
 
 
568
const char *ssl_cmd_SSLFIPS(cmd_parms *cmd, void *dcfg, int flag);
 
569
 
565
570
/**  module initialization  */
566
571
int          ssl_init_Module(apr_pool_t *, apr_pool_t *, apr_pool_t *, server_rec *);
567
572
void         ssl_init_Engine(server_rec *, apr_pool_t *);