Changeset 259e835 in mod_gnutls for src/mod_gnutls.c


Ignore:
Timestamp:
Apr 4, 2015, 4:57:10 PM (5 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, upstream
Children:
c4a015b
Parents:
1d9cfaf (diff), c32240f (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.
git-author:
Thomas Klute <thomas2.klute@…> (04/04/15 16:54:45)
git-committer:
Thomas Klute <thomas2.klute@…> (04/04/15 16:57:10)
Message:

Merge branch 'master' into new-gnutls-api

Branch 'master' at this point represents the upstream mod_gnutls
repository. Merging that first should make it easier to merge with my
changes later.

The result compiles, but OpenPGP authentication does not work.

Resolved conflicts in:

src/gnutls_config.c
src/gnutls_hooks.c

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/mod_gnutls.c

    r1d9cfaf r259e835  
    2020#include "mod_gnutls.h"
    2121
    22 static void gnutls_hooks(apr_pool_t * p) {
     22static void gnutls_hooks(apr_pool_t * p __attribute__((unused))) {
    2323
    2424    /* Try Run Post-Config Hook After mod_proxy */
Note: See TracChangeset for help on using the changeset viewer.