Changeset 8982265 in mod_gnutls for include/mod_gnutls.h.in


Ignore:
Timestamp:
Apr 16, 2018, 8:43:01 PM (3 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports
Children:
85c5a22
Parents:
300ae82 (diff), f4ac9ccd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge tag 'upstream/0.8.4' into debian/master

Upstream version 0.8.4

File:
1 edited

Legend:

Unmodified
Added
Removed
  • include/mod_gnutls.h.in

    r300ae82 r8982265  
    22 *  Copyright 2004-2005 Paul Querna
    33 *  Copyright 2014 Nikos Mavrogiannopoulos
    4  *  Copyright 2015-2016 Thomas Klute
     4 *  Copyright 2015-2018 Fiona Klute
    55 *
    66 *  Licensed under the Apache License, Version 2.0 (the "License");
     
    292292is using SSL/TLS. */
    293293APR_DECLARE_OPTIONAL_FN(int, ssl_is_https, (conn_rec *));
     294/* The ssl_var_lookup() optional function retrieves SSL environment
     295 * variables. */
     296APR_DECLARE_OPTIONAL_FN(char *, ssl_var_lookup,
     297                        (apr_pool_t *, server_rec *,
     298                         conn_rec *, request_rec *,
     299                         char *));
    294300/* The ssl_proxy_enable() and ssl_engine_disable() optional functions
    295301 * are used by mod_proxy to enable use of SSL for outgoing
     
    297303APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable, (conn_rec *));
    298304APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *));
     305APR_DECLARE_OPTIONAL_FN(int, ssl_engine_set, (conn_rec *,
     306                                              ap_conf_vector_t *,
     307                                              int proxy, int enable));
     308mgs_handle_t* get_effective_gnutls_ctxt(conn_rec *c);
    299309int ssl_is_https(conn_rec *c);
     310char* ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c,
     311                     request_rec *r, char *var);
    300312int ssl_proxy_enable(conn_rec *c);
    301313int ssl_engine_disable(conn_rec *c);
     
    458470int mgs_hook_pre_connection(conn_rec * c, void *csd);
    459471
     472int mgs_hook_process_connection(conn_rec* c);
     473
    460474int mgs_hook_fixups(request_rec *r);
    461475
Note: See TracChangeset for help on using the changeset viewer.