Changeset bcbcf5d in mod_gnutls


Ignore:
Timestamp:
Nov 22, 2015, 1:43:49 PM (2 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian, jessie-backports
Children:
7787f59
Parents:
ff45aa3 (diff), 02c8e54 (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.7.2' into debian

Upstream version 0.7.2

Files:
20 added
22 edited

Legend:

Unmodified
Added
Removed
  • CHANGELOG

    r71cac80 r07cc51f  
    22- Handle Unclean Shutdowns
    33- make session cache use generic apache caches
     4
     5** Version 0.7.2 (2015-11-21)
     6- Bugfix: Non-blocking reads in the input filter could lead to a busy
     7  wait in the gnutls_io_input_read function, causing high load on
     8  Keep-Alive connections waiting for data, until either more data
     9  could be received or the connection was closed. The fix is to pass
     10  EAGAIN/EINTR results up to the input filter so they can be handled
     11  properly.
     12- Close TLS session if the input filter receives EOF (mostly relevant
     13  for proper termination of proxy connections).
     14- Remove dependency on APR Memcache, which is replaced by the newer
     15  version included in the APR Utility Library (libaprutil).
     16- Remove dependency on bc. It was used for floating point arithmetic
     17  in the test suite, the calculations have been changed to use
     18  integers and pure bash code.
    419
    520** Version 0.7.1 (2015-10-18)
  • Makefile.in

    r4addf74 r02c8e54  
    1 # Makefile.in generated by automake 1.14.1 from Makefile.am.
     1# Makefile.in generated by automake 1.15 from Makefile.am.
    22# @configure_input@
    33
    4 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
     4# Copyright (C) 1994-2014 Free Software Foundation, Inc.
    55
    66# This Makefile.in is free software; the Free Software Foundation
     
    1515@SET_MAKE@
    1616VPATH = @srcdir@
    17 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
     17am__is_gnu_make = { \
     18  if test -z '$(MAKELEVEL)'; then \
     19    false; \
     20  elif test -n '$(MAKE_HOST)'; then \
     21    true; \
     22  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     23    true; \
     24  else \
     25    false; \
     26  fi; \
     27}
    1828am__make_running_with_option = \
    1929  case $${target_option-} in \
     
    8090target_triplet = @target@
    8191subdir = .
    82 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
    83         $(top_srcdir)/configure $(am__configure_deps) \
    84         $(srcdir)/config.in $(top_srcdir)/include/mod_gnutls.h.in \
    85         README config/compile config/config.guess config/config.sub \
    86         config/depcomp config/install-sh config/missing \
    87         config/ltmain.sh $(top_srcdir)/config/compile \
    88         $(top_srcdir)/config/config.guess \
    89         $(top_srcdir)/config/config.sub \
    90         $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
    91         $(top_srcdir)/config/missing
    9292ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    9393am__aclocal_m4_deps = $(top_srcdir)/m4/apache.m4 \
     
    9999am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    100100        $(ACLOCAL_M4)
     101DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
     102        $(am__configure_deps) $(am__DIST_COMMON)
    101103am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
    102104 configure.lineno config.status.lineno
     
    162164CSCOPE = cscope
    163165DIST_SUBDIRS = $(SUBDIRS)
     166am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.in \
     167        $(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
     168        $(top_srcdir)/config/config.sub \
     169        $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
     170        $(top_srcdir)/config/missing \
     171        $(top_srcdir)/include/mod_gnutls.h.in README config/compile \
     172        config/config.guess config/config.sub config/depcomp \
     173        config/install-sh config/ltmain.sh config/missing
    164174DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    165175distdir = $(PACKAGE)-$(VERSION)
     
    216226APR_MEMCACHE_CFLAGS = @APR_MEMCACHE_CFLAGS@
    217227APR_MEMCACHE_LIBS = @APR_MEMCACHE_LIBS@
     228APR_UTIL_CONF = @APR_UTIL_CONF@
    218229APU_INCLUDES = @APU_INCLUDES@
    219230APU_LDFLAGS = @APU_LDFLAGS@
     
    392403        $(am__cd) $(top_srcdir) && \
    393404          $(AUTOMAKE) --foreign Makefile
    394 .PRECIOUS: Makefile
    395405Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    396406        @case '$?' in \
     
    624634
    625635dist-tarZ: distdir
    626         @echo WARNING: "Support for shar distribution archives is" \
    627                        "deprecated." >&2
     636        @echo WARNING: "Support for distribution archives compressed with" \
     637                       "legacy program 'compress' is deprecated." >&2
    628638        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
    629639        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
     
    631641
    632642dist-shar: distdir
    633         @echo WARNING: "Support for distribution archives compressed with" \
    634                        "legacy program 'compress' is deprecated." >&2
     643        @echo WARNING: "Support for shar distribution archives is" \
     644                       "deprecated." >&2
    635645        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
    636646        shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
     
    668678        chmod -R a-w $(distdir)
    669679        chmod u+w $(distdir)
    670         mkdir $(distdir)/_build $(distdir)/_inst
     680        mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
    671681        chmod a-w $(distdir)
    672682        test -d $(distdir)/_build || exit 0; \
     
    674684          && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
    675685          && am__cwd=`pwd` \
    676           && $(am__cd) $(distdir)/_build \
    677           && ../configure \
     686          && $(am__cd) $(distdir)/_build/sub \
     687          && ../../configure \
    678688            $(AM_DISTCHECK_CONFIGURE_FLAGS) \
    679689            $(DISTCHECK_CONFIGURE_FLAGS) \
    680             --srcdir=.. --prefix="$$dc_install_base" \
     690            --srcdir=../.. --prefix="$$dc_install_base" \
    681691          && $(MAKE) $(AM_MAKEFLAGS) \
    682692          && $(MAKE) $(AM_MAKEFLAGS) dvi \
     
    855865        uninstall-am
    856866
     867.PRECIOUS: Makefile
     868
    857869
    858870# Tell versions [3.59,3.63) of GNU make to not export all variables.
  • README

    r9a4d250 rd6a575c  
    2525 * Apache HTTPD    >= 2.2 <http://httpd.apache.org/> (2.4.* preferred)
    2626 * autotools, GNU make, & gcc
    27  * APR Memcache    >= 0.7.0 (Optional)
    2827 * libmsv          >= 0.1 (Optional, enable with ./configure --enable-msva)
    2928 * pandoc   (for documentation, optional)
  • aclocal.m4

    r4addf74 r02c8e54  
    1 # generated automatically by aclocal 1.14.1 -*- Autoconf -*-
    2 
    3 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
     1# generated automatically by aclocal 1.15 -*- Autoconf -*-
     2
     3# Copyright (C) 1996-2014 Free Software Foundation, Inc.
    44
    55# This file is free software; the Free Software Foundation
     
    236236])# PKG_CHECK_VAR
    237237
    238 # Copyright (C) 2002-2013 Free Software Foundation, Inc.
     238# Copyright (C) 2002-2014 Free Software Foundation, Inc.
    239239#
    240240# This file is free software; the Free Software Foundation
     
    248248# (This private macro should not be called outside this file.)
    249249AC_DEFUN([AM_AUTOMAKE_VERSION],
    250 [am__api_version='1.14'
     250[am__api_version='1.15'
    251251dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
    252252dnl require some minimum version.  Point them to the right macro.
    253 m4_if([$1], [1.14.1], [],
     253m4_if([$1], [1.15], [],
    254254      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
    255255])
     
    267267# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
    268268AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
    269 [AM_AUTOMAKE_VERSION([1.14.1])dnl
     269[AM_AUTOMAKE_VERSION([1.15])dnl
    270270m4_ifndef([AC_AUTOCONF_VERSION],
    271271  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
     
    274274# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
    275275
    276 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
     276# Copyright (C) 2001-2014 Free Software Foundation, Inc.
    277277#
    278278# This file is free software; the Free Software Foundation
     
    319319
    320320AC_DEFUN([AM_AUX_DIR_EXPAND],
    321 [dnl Rely on autoconf to set up CDPATH properly.
    322 AC_PREREQ([2.50])dnl
    323 # expand $ac_aux_dir to an absolute path
    324 am_aux_dir=`cd $ac_aux_dir && pwd`
     321[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
     322# Expand $ac_aux_dir to an absolute path.
     323am_aux_dir=`cd "$ac_aux_dir" && pwd`
    325324])
    326325
    327326# AM_CONDITIONAL                                            -*- Autoconf -*-
    328327
    329 # Copyright (C) 1997-2013 Free Software Foundation, Inc.
     328# Copyright (C) 1997-2014 Free Software Foundation, Inc.
    330329#
    331330# This file is free software; the Free Software Foundation
     
    358357fi])])
    359358
    360 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
     359# Copyright (C) 1999-2014 Free Software Foundation, Inc.
    361360#
    362361# This file is free software; the Free Software Foundation
     
    549548# Generate code to set up dependency tracking.              -*- Autoconf -*-
    550549
    551 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
     550# Copyright (C) 1999-2014 Free Software Foundation, Inc.
    552551#
    553552# This file is free software; the Free Software Foundation
     
    625624# Do all the work for Automake.                             -*- Autoconf -*-
    626625
    627 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
     626# Copyright (C) 1996-2014 Free Software Foundation, Inc.
    628627#
    629628# This file is free software; the Free Software Foundation
     
    715714# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
    716715AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
    717 # We need awk for the "check" target.  The system "awk" is bad on
    718 # some platforms.
     716# We need awk for the "check" target (and possibly the TAP driver).  The
     717# system "awk" is bad on some platforms.
    719718AC_REQUIRE([AC_PROG_AWK])dnl
    720719AC_REQUIRE([AC_PROG_MAKE_SET])dnl
     
    790789  fi
    791790fi
     791dnl The trailing newline in this macro's definition is deliberate, for
     792dnl backward compatibility and to allow trailing 'dnl'-style comments
     793dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
    792794])
    793795
     
    819821echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
    820822
    821 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
     823# Copyright (C) 2001-2014 Free Software Foundation, Inc.
    822824#
    823825# This file is free software; the Free Software Foundation
     
    830832AC_DEFUN([AM_PROG_INSTALL_SH],
    831833[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
    832 if test x"${install_sh}" != xset; then
     834if test x"${install_sh+set}" != xset; then
    833835  case $am_aux_dir in
    834836  *\ * | *\     *)
     
    840842AC_SUBST([install_sh])])
    841843
    842 # Copyright (C) 2003-2013 Free Software Foundation, Inc.
     844# Copyright (C) 2003-2014 Free Software Foundation, Inc.
    843845#
    844846# This file is free software; the Free Software Foundation
     
    862864# From Jim Meyering
    863865
    864 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
     866# Copyright (C) 1996-2014 Free Software Foundation, Inc.
    865867#
    866868# This file is free software; the Free Software Foundation
     
    897899# Check to see how 'make' treats includes.                  -*- Autoconf -*-
    898900
    899 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
     901# Copyright (C) 2001-2014 Free Software Foundation, Inc.
    900902#
    901903# This file is free software; the Free Software Foundation
     
    947949# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
    948950
    949 # Copyright (C) 1997-2013 Free Software Foundation, Inc.
     951# Copyright (C) 1997-2014 Free Software Foundation, Inc.
    950952#
    951953# This file is free software; the Free Software Foundation
     
    988990# error messages when used, to smooth transition.
    989991#
    990 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
     992# Copyright (C) 1996-2014 Free Software Foundation, Inc.
    991993#
    992994# This file is free software; the Free Software Foundation
     
    10151017# Helper functions for option handling.                     -*- Autoconf -*-
    10161018
    1017 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
     1019# Copyright (C) 2001-2014 Free Software Foundation, Inc.
    10181020#
    10191021# This file is free software; the Free Software Foundation
     
    10441046[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
    10451047
    1046 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
     1048# Copyright (C) 1999-2014 Free Software Foundation, Inc.
    10471049#
    10481050# This file is free software; the Free Software Foundation
     
    10911093AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
    10921094
    1093 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
     1095# Copyright (C) 2001-2014 Free Software Foundation, Inc.
    10941096#
    10951097# This file is free software; the Free Software Foundation
     
    11101112# Check to make sure that the build environment is sane.    -*- Autoconf -*-
    11111113
    1112 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
     1114# Copyright (C) 1996-2014 Free Software Foundation, Inc.
    11131115#
    11141116# This file is free software; the Free Software Foundation
     
    11911193])
    11921194
    1193 # Copyright (C) 2009-2013 Free Software Foundation, Inc.
     1195# Copyright (C) 2009-2014 Free Software Foundation, Inc.
    11941196#
    11951197# This file is free software; the Free Software Foundation
     
    12511253])
    12521254
    1253 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
     1255# Copyright (C) 2001-2014 Free Software Foundation, Inc.
    12541256#
    12551257# This file is free software; the Free Software Foundation
     
    12791281AC_SUBST([INSTALL_STRIP_PROGRAM])])
    12801282
    1281 # Copyright (C) 2006-2013 Free Software Foundation, Inc.
     1283# Copyright (C) 2006-2014 Free Software Foundation, Inc.
    12821284#
    12831285# This file is free software; the Free Software Foundation
     
    12981300# Check how to create a tarball.                            -*- Autoconf -*-
    12991301
    1300 # Copyright (C) 2004-2013 Free Software Foundation, Inc.
     1302# Copyright (C) 2004-2014 Free Software Foundation, Inc.
    13011303#
    13021304# This file is free software; the Free Software Foundation
  • config/compile

    r4addf74 r02c8e54  
    44scriptversion=2012-10-14.11; # UTC
    55
    6 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
     6# Copyright (C) 1999-2014 Free Software Foundation, Inc.
    77# Written by Tom Tromey <tromey@cygnus.com>.
    88#
  • config/depcomp

    r4addf74 r02c8e54  
    44scriptversion=2013-05-30.07; # UTC
    55
    6 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
     6# Copyright (C) 1999-2014 Free Software Foundation, Inc.
    77
    88# This program is free software; you can redistribute it and/or modify
  • config/install-sh

    r4addf74 r02c8e54  
    22# install - install a program, script, or datafile
    33
    4 scriptversion=2011-11-20.07; # UTC
     4scriptversion=2013-12-25.23; # UTC
    55
    66# This originates from X11R5 (mit/util/scripts/install.sh), which was
     
    4242# from scratch.
    4343
     44tab='   '
    4445nl='
    4546'
    46 IFS=" ""        $nl"
    47 
    48 # set DOITPROG to echo to test this script
    49 
    50 # Don't use :- since 4.3BSD and earlier shells don't like it.
     47IFS=" $tab$nl"
     48
     49# Set DOITPROG to "echo" to test this script.
     50
    5151doit=${DOITPROG-}
    52 if test -z "$doit"; then
    53   doit_exec=exec
    54 else
    55   doit_exec=$doit
    56 fi
     52doit_exec=${doit:-exec}
    5753
    5854# Put in absolute file names if you don't have them in your path;
     
    6965stripprog=${STRIPPROG-strip}
    7066
    71 posix_glob='?'
    72 initialize_posix_glob='
    73   test "$posix_glob" != "?" || {
    74     if (set -f) 2>/dev/null; then
    75       posix_glob=
    76     else
    77       posix_glob=:
    78     fi
    79   }
    80 '
    81 
    8267posix_mkdir=
    8368
     
    9883
    9984copy_on_change=false
    100 no_target_directory=
     85is_target_a_directory=possibly
    10186
    10287usage="\
     
    138123
    139124    -g) chgrpcmd="$chgrpprog $2"
    140         shift;;
     125        shift;;
    141126
    142127    --help) echo "$usage"; exit $?;;
    143128
    144129    -m) mode=$2
    145         case $mode in
    146           *' '* | *'    '* | *'
    147 '*        | *'*'* | *'?'* | *'['*)
    148             echo "$0: invalid mode: $mode" >&2
    149             exit 1;;
    150         esac
    151         shift;;
     130        case $mode in
     131          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
     132            echo "$0: invalid mode: $mode" >&2
     133            exit 1;;
     134        esac
     135        shift;;
    152136
    153137    -o) chowncmd="$chownprog $2"
    154         shift;;
     138        shift;;
    155139
    156140    -s) stripcmd=$stripprog;;
    157141
    158     -t) dst_arg=$2
    159         # Protect names problematic for 'test' and other utilities.
    160         case $dst_arg in
    161           -* | [=\(\)!]) dst_arg=./$dst_arg;;
    162         esac
    163         shift;;
    164 
    165     -T) no_target_directory=true;;
     142    -t)
     143        is_target_a_directory=always
     144        dst_arg=$2
     145        # Protect names problematic for 'test' and other utilities.
     146        case $dst_arg in
     147          -* | [=\(\)!]) dst_arg=./$dst_arg;;
     148        esac
     149        shift;;
     150
     151    -T) is_target_a_directory=never;;
    166152
    167153    --version) echo "$0 $scriptversion"; exit $?;;
    168154
    169     --) shift
    170         break;;
    171 
    172     -*) echo "$0: invalid option: $1" >&2
    173         exit 1;;
     155    --) shift
     156        break;;
     157
     158    -*) echo "$0: invalid option: $1" >&2
     159        exit 1;;
    174160
    175161    *)  break;;
     
    177163  shift
    178164done
     165
     166# We allow the use of options -d and -T together, by making -d
     167# take the precedence; this is for compatibility with GNU install.
     168
     169if test -n "$dir_arg"; then
     170  if test -n "$dst_arg"; then
     171    echo "$0: target directory not allowed when installing a directory." >&2
     172    exit 1
     173  fi
     174fi
    179175
    180176if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     
    209205
    210206if test -z "$dir_arg"; then
     207  if test $# -gt 1 || test "$is_target_a_directory" = always; then
     208    if test ! -d "$dst_arg"; then
     209      echo "$0: $dst_arg: Is not a directory." >&2
     210      exit 1
     211    fi
     212  fi
     213fi
     214
     215if test -z "$dir_arg"; then
    211216  do_exit='(exit $ret); exit $ret'
    212217  trap "ret=129; $do_exit" 1
     
    224229    *[0-7])
    225230      if test -z "$stripcmd"; then
    226         u_plus_rw=
     231        u_plus_rw=
    227232      else
    228         u_plus_rw='% 200'
     233        u_plus_rw='% 200'
    229234      fi
    230235      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
    231236    *)
    232237      if test -z "$stripcmd"; then
    233         u_plus_rw=
     238        u_plus_rw=
    234239      else
    235         u_plus_rw=,u+rw
     240        u_plus_rw=,u+rw
    236241      fi
    237242      cp_umask=$mode$u_plus_rw;;
     
    270275    # if double slashes aren't ignored.
    271276    if test -d "$dst"; then
    272       if test -n "$no_target_directory"; then
    273         echo "$0: $dst_arg: Is a directory" >&2
    274         exit 1
     277      if test "$is_target_a_directory" = never; then
     278        echo "$0: $dst_arg: Is a directory" >&2
     279        exit 1
    275280      fi
    276281      dstdir=$dst
     
    278283      dstdir_status=0
    279284    else
    280       # Prefer dirname, but fall back on a substitute if dirname fails.
    281       dstdir=`
    282         (dirname "$dst") 2>/dev/null ||
    283         expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
    284              X"$dst" : 'X\(//\)[^/]' \| \
    285              X"$dst" : 'X\(//\)$' \| \
    286              X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
    287         echo X"$dst" |
    288             sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
    289                    s//\1/
    290                    q
    291                  }
    292                  /^X\(\/\/\)[^/].*/{
    293                    s//\1/
    294                    q
    295                  }
    296                  /^X\(\/\/\)$/{
    297                    s//\1/
    298                    q
    299                  }
    300                  /^X\(\/\).*/{
    301                    s//\1/
    302                    q
    303                  }
    304                  s/.*/./; q'
    305       `
    306 
     285      dstdir=`dirname "$dst"`
    307286      test -d "$dstdir"
    308287      dstdir_status=$?
     
    315294    case $posix_mkdir in
    316295      '')
    317         # Create intermediate dirs using mode 755 as modified by the umask.
    318         # This is like FreeBSD 'install' as of 1997-10-28.
    319         umask=`umask`
    320         case $stripcmd.$umask in
    321           # Optimize common cases.
    322           *[2367][2367]) mkdir_umask=$umask;;
    323           .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
    324 
    325           *[0-7])
    326             mkdir_umask=`expr $umask + 22 \
    327               - $umask % 100 % 40 + $umask % 20 \
    328               - $umask % 10 % 4 + $umask % 2
    329             `;;
    330           *) mkdir_umask=$umask,go-w;;
    331         esac
    332 
    333         # With -d, create the new directory with the user-specified mode.
    334         # Otherwise, rely on $mkdir_umask.
    335         if test -n "$dir_arg"; then
    336           mkdir_mode=-m$mode
    337         else
    338           mkdir_mode=
    339         fi
    340 
    341         posix_mkdir=false
    342         case $umask in
    343           *[123567][0-7][0-7])
    344             # POSIX mkdir -p sets u+wx bits regardless of umask, which
    345             # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
    346             ;;
    347           *)
    348             tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
    349             trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
    350 
    351             if (umask $mkdir_umask &&
    352                 exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
    353             then
    354               if test -z "$dir_arg" || {
    355                    # Check for POSIX incompatibilities with -m.
    356                    # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
    357                    # other-writable bit of parent directory when it shouldn't.
    358                    # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
    359                    ls_ld_tmpdir=`ls -ld "$tmpdir"`
    360                    case $ls_ld_tmpdir in
    361                      d????-?r-*) different_mode=700;;
    362                      d????-?--*) different_mode=755;;
    363                      *) false;;
    364                    esac &&
    365                    $mkdirprog -m$different_mode -p -- "$tmpdir" && {
    366                      ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
    367                      test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
    368                    }
    369                 }
    370               then posix_mkdir=:
    371               fi
    372               rmdir "$tmpdir/d" "$tmpdir"
    373             else
    374               # Remove any dirs left behind by ancient mkdir implementations.
    375               rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
    376             fi
    377             trap '' 0;;
    378         esac;;
     296        # Create intermediate dirs using mode 755 as modified by the umask.
     297        # This is like FreeBSD 'install' as of 1997-10-28.
     298        umask=`umask`
     299        case $stripcmd.$umask in
     300          # Optimize common cases.
     301          *[2367][2367]) mkdir_umask=$umask;;
     302          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
     303
     304          *[0-7])
     305            mkdir_umask=`expr $umask + 22 \
     306              - $umask % 100 % 40 + $umask % 20 \
     307              - $umask % 10 % 4 + $umask % 2
     308            `;;
     309          *) mkdir_umask=$umask,go-w;;
     310        esac
     311
     312        # With -d, create the new directory with the user-specified mode.
     313        # Otherwise, rely on $mkdir_umask.
     314        if test -n "$dir_arg"; then
     315          mkdir_mode=-m$mode
     316        else
     317          mkdir_mode=
     318        fi
     319
     320        posix_mkdir=false
     321        case $umask in
     322          *[123567][0-7][0-7])
     323            # POSIX mkdir -p sets u+wx bits regardless of umask, which
     324            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
     325            ;;
     326          *)
     327            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
     328            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
     329
     330            if (umask $mkdir_umask &&
     331                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
     332            then
     333              if test -z "$dir_arg" || {
     334                   # Check for POSIX incompatibilities with -m.
     335                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
     336                   # other-writable bit of parent directory when it shouldn't.
     337                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
     338                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
     339                   case $ls_ld_tmpdir in
     340                     d????-?r-*) different_mode=700;;
     341                     d????-?--*) different_mode=755;;
     342                     *) false;;
     343                   esac &&
     344                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
     345                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
     346                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
     347                   }
     348                }
     349              then posix_mkdir=:
     350              fi
     351              rmdir "$tmpdir/d" "$tmpdir"
     352            else
     353              # Remove any dirs left behind by ancient mkdir implementations.
     354              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
     355            fi
     356            trap '' 0;;
     357        esac;;
    379358    esac
    380359
    381360    if
    382361      $posix_mkdir && (
    383         umask $mkdir_umask &&
    384         $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
     362        umask $mkdir_umask &&
     363        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
    385364      )
    386365    then :
     
    392371
    393372      case $dstdir in
    394         /*) prefix='/';;
    395         [-=\(\)!]*) prefix='./';;
    396         *)  prefix='';;
     373        /*) prefix='/';;
     374        [-=\(\)!]*) prefix='./';;
     375        *)  prefix='';;
    397376      esac
    398 
    399       eval "$initialize_posix_glob"
    400377
    401378      oIFS=$IFS
    402379      IFS=/
    403       $posix_glob set -f
     380      set -f
    404381      set fnord $dstdir
    405382      shift
    406       $posix_glob set +f
     383      set +f
    407384      IFS=$oIFS
    408385
     
    411388      for d
    412389      do
    413         test X"$d" = X && continue
    414 
    415         prefix=$prefix$d
    416         if test -d "$prefix"; then
    417           prefixes=
    418         else
    419           if $posix_mkdir; then
    420             (umask=$mkdir_umask &&
    421              $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
    422             # Don't fail if two instances are running concurrently.
    423             test -d "$prefix" || exit 1
    424           else
    425             case $prefix in
    426               *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
    427               *) qprefix=$prefix;;
    428             esac
    429             prefixes="$prefixes '$qprefix'"
    430           fi
    431         fi
    432         prefix=$prefix/
     390        test X"$d" = X && continue
     391
     392        prefix=$prefix$d
     393        if test -d "$prefix"; then
     394          prefixes=
     395        else
     396          if $posix_mkdir; then
     397            (umask=$mkdir_umask &&
     398             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
     399            # Don't fail if two instances are running concurrently.
     400            test -d "$prefix" || exit 1
     401          else
     402            case $prefix in
     403              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
     404              *) qprefix=$prefix;;
     405            esac
     406            prefixes="$prefixes '$qprefix'"
     407          fi
     408        fi
     409        prefix=$prefix/
    433410      done
    434411
    435412      if test -n "$prefixes"; then
    436         # Don't fail if two instances are running concurrently.
    437         (umask $mkdir_umask &&
    438         eval "\$doit_exec \$mkdirprog $prefixes") ||
    439           test -d "$dstdir" || exit 1
    440         obsolete_mkdir_used=true
     413        # Don't fail if two instances are running concurrently.
     414        (umask $mkdir_umask &&
     415        eval "\$doit_exec \$mkdirprog $prefixes") ||
     416          test -d "$dstdir" || exit 1
     417        obsolete_mkdir_used=true
    441418      fi
    442419    fi
     
    473450    # If -C, don't bother to copy if it wouldn't change the file.
    474451    if $copy_on_change &&
    475        old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
    476        new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
    477 
    478        eval "$initialize_posix_glob" &&
    479        $posix_glob set -f &&
     452       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
     453       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
     454       set -f &&
    480455       set X $old && old=:$2:$4:$5:$6 &&
    481456       set X $new && new=:$2:$4:$5:$6 &&
    482        $posix_glob set +f &&
    483 
     457       set +f &&
    484458       test "$old" = "$new" &&
    485459       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     
    494468      # support -f.
    495469      {
    496         # Now remove or move aside any old file at destination location.
    497         # We try this two ways since rm can't unlink itself on some
    498         # systems and the destination file might be busy for other
    499         # reasons.  In this case, the final cleanup might fail but the new
    500         # file should still install successfully.
    501         {
    502           test ! -f "$dst" ||
    503           $doit $rmcmd -f "$dst" 2>/dev/null ||
    504           { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
    505             { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
    506           } ||
    507           { echo "$0: cannot unlink or rename $dst" >&2
    508             (exit 1); exit 1
    509           }
    510         } &&
    511 
    512         # Now rename the file to the real destination.
    513         $doit $mvcmd "$dsttmp" "$dst"
     470        # Now remove or move aside any old file at destination location.
     471        # We try this two ways since rm can't unlink itself on some
     472        # systems and the destination file might be busy for other
     473        # reasons.  In this case, the final cleanup might fail but the new
     474        # file should still install successfully.
     475        {
     476          test ! -f "$dst" ||
     477          $doit $rmcmd -f "$dst" 2>/dev/null ||
     478          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
     479            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
     480          } ||
     481          { echo "$0: cannot unlink or rename $dst" >&2
     482            (exit 1); exit 1
     483          }
     484        } &&
     485
     486        # Now rename the file to the real destination.
     487        $doit $mvcmd "$dsttmp" "$dst"
    514488      }
    515489    fi || exit 1
  • config/missing

    r4addf74 r02c8e54  
    44scriptversion=2013-10-28.13; # UTC
    55
    6 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
     6# Copyright (C) 1996-2014 Free Software Foundation, Inc.
    77# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
    88
  • config/test-driver

    r4addf74 r02c8e54  
    44scriptversion=2013-07-13.22; # UTC
    55
    6 # Copyright (C) 2011-2013 Free Software Foundation, Inc.
     6# Copyright (C) 2011-2014 Free Software Foundation, Inc.
    77#
    88# This program is free software; you can redistribute it and/or modify
     
    107107"$@" >$log_file 2>&1
    108108estatus=$?
     109
    109110if test $enable_hard_errors = no && test $estatus -eq 99; then
    110   estatus=1
     111  tweaked_estatus=1
     112else
     113  tweaked_estatus=$estatus
    111114fi
    112115
    113 case $estatus:$expect_failure in
     116case $tweaked_estatus:$expect_failure in
    114117  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
    115118  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
     
    119122  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
    120123esac
     124
     125# Report the test outcome and exit status in the logs, so that one can
     126# know whether the test passed or failed simply by looking at the '.log'
     127# file, without the need of also peaking into the corresponding '.trs'
     128# file (automake bug#11814).
     129echo "$res $test_name (exit status: $estatus)" >>$log_file
    121130
    122131# Report outcome to console.
  • configure

    r89f863f r02c8e54  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for mod_gnutls 0.7.1.
     3# Generated by GNU Autoconf 2.69 for mod_gnutls 0.7.2.
    44#
    55#
     
    588588PACKAGE_NAME='mod_gnutls'
    589589PACKAGE_TARNAME='mod_gnutls'
    590 PACKAGE_VERSION='0.7.1'
    591 PACKAGE_STRING='mod_gnutls 0.7.1'
     590PACKAGE_VERSION='0.7.2'
     591PACKAGE_STRING='mod_gnutls 0.7.2'
    592592PACKAGE_BUGREPORT=''
    593593PACKAGE_URL=''
     
    648648APR_MEMCACHE_CFLAGS
    649649APR_MEMCACHE_LIBS
     650APR_UTIL_CONF
    650651USE_MSVA_FALSE
    651652USE_MSVA_TRUE
     
    819820enable_strict
    820821enable_msva
    821 with_apr_memcache_prefix
    822 with_apr_memcache_libs
    823 with_apr_memcache_includes
     822with_apu_config
    824823'
    825824      ac_precious_vars='build_alias
     
    13791378  # This message is too long to be a string in the A/UX 3.1 sh.
    13801379  cat <<_ACEOF
    1381 \`configure' configures mod_gnutls 0.7.1 to adapt to many kinds of systems.
     1380\`configure' configures mod_gnutls 0.7.2 to adapt to many kinds of systems.
    13821381
    13831382Usage: $0 [OPTION]... [VAR=VALUE]...
     
    14501449if test -n "$ac_init_help"; then
    14511450  case $ac_init_help in
    1452      short | recursive ) echo "Configuration of mod_gnutls 0.7.1:";;
     1451     short | recursive ) echo "Configuration of mod_gnutls 0.7.2:";;
    14531452   esac
    14541453  cat <<\_ACEOF
     
    14881487                        (or the compiler's sysroot if not specified).
    14891488  --with-apxs=PATH        Path to apxs
    1490   --with-apr-memcache-prefix=PATH
    1491                           Install prefix for apr_memcache
    1492   --with-apr-memcache-libs=PATH
    1493                           Path to apr_memcache libs
    1494   --with-apr-memcache-includes=PATH
    1495                           Path to apr_memcache includes
     1489  --with-apu-config=PATH  Path to APR Utility Library config tool
     1490                          (apu-1-config)
    14961491
    14971492Some influential environment variables:
     
    15841579if $ac_init_version; then
    15851580  cat <<\_ACEOF
    1586 mod_gnutls configure 0.7.1
     1581mod_gnutls configure 0.7.2
    15871582generated by GNU Autoconf 2.69
    15881583
     
    19951990running configure, to aid debugging if configure makes a mistake.
    19961991
    1997 It was created by mod_gnutls $as_me 0.7.1, which was
     1992It was created by mod_gnutls $as_me 0.7.2, which was
    19981993generated by GNU Autoconf 2.69.  Invocation command line was
    19991994
     
    23612356  chmod +x config.nice
    23622357
    2363 MOD_GNUTLS_VERSION=0.7.1
     2358MOD_GNUTLS_VERSION=0.7.2
    23642359
    23652360
     
    25402535  program_prefix=${target_alias}-
    25412536# mod_gnutls test suite requires GNU make
    2542 am__api_version='1.14'
     2537am__api_version='1.15'
    25432538
    25442539# Find a good install program.  We prefer a C program (faster),
     
    27122707program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
    27132708
    2714 # expand $ac_aux_dir to an absolute path
    2715 am_aux_dir=`cd $ac_aux_dir && pwd`
     2709# Expand $ac_aux_dir to an absolute path.
     2710am_aux_dir=`cd "$ac_aux_dir" && pwd`
    27162711
    27172712if test x"${MISSING+set}" != xset; then
     
    27322727fi
    27332728
    2734 if test x"${install_sh}" != xset; then
     2729if test x"${install_sh+set}" != xset; then
    27352730  case $am_aux_dir in
    27362731  *\ * | *\     *)
     
    30263021# Define the identity of the package.
    30273022 PACKAGE='mod_gnutls'
    3028  VERSION='0.7.1'
     3023 VERSION='0.7.2'
    30293024
    30303025
     
    30603055mkdir_p='$(MKDIR_P)'
    30613056
    3062 # We need awk for the "check" target.  The system "awk" is bad on
    3063 # some platforms.
     3057# We need awk for the "check" target (and possibly the TAP driver).  The
     3058# system "awk" is bad on some platforms.
    30643059# Always define AMTAR for backward compatibility.  Yes, it's still used
    30653060# in the wild :-(  We should find a proper way to deprecate it ...
     
    1272712722
    1272812723
    12729 # Check whether --with-apr-memcache-prefix was given.
    12730 if test "${with_apr_memcache_prefix+set}" = set; then :
    12731   withval=$with_apr_memcache_prefix; apr_memcache_prefix="$withval"
    12732 else
    12733   :
    12734 fi
    12735 
    12736 
    12737 # Check whether --with-apr-memcache-libs was given.
    12738 if test "${with_apr_memcache_libs+set}" = set; then :
    12739   withval=$with_apr_memcache_libs; apr_memcache_libs="$withval"
    12740 else
    12741   :
    12742 fi
    12743 
    12744 
    12745 # Check whether --with-apr-memcache-includes was given.
    12746 if test "${with_apr_memcache_includes+set}" = set; then :
    12747   withval=$with_apr_memcache_includes; apr_memcache_includes="$withval"
    12748 else
    12749   :
    12750 fi
    12751 
     12724# Check whether --with-apu-config was given.
     12725if test "${with_apu_config+set}" = set; then :
     12726  withval=$with_apu_config; apr_util_config="$withval"
     12727fi
    1275212728
    1275312729
     
    1275712733save_LDFLAGS=$LDFLAGS
    1275812734
    12759 if test -n "$apr_memcache_libs"; then
    12760     apr_memcache_libdir=$apr_memcache_libs
    12761 elif test -n "$apr_memcache_prefix"; then
    12762     apr_memcache_libdir=$apr_memcache_prefix/lib
    12763 fi
    12764 if test -n "$apr_memcache_libdir"; then
    12765     LDFLAGS="-L$apr_memcache_libdir $LDFLAGS"
    12766 fi
    12767 
    12768 if test -n "$apr_memcache_includes"; then
    12769     apr_memcache_includedir=$apr_memcache_includes
    12770 elif test -n "$apr_memcache_prefix"; then
    12771     apr_memcache_includedir=$apr_memcache_prefix/include/apr_memcache-0
    12772 else
    12773     apr_memcache_includedir=$includedir/apr_memcache-0
    12774 fi
    12775 
    12776 CFLAGS="-I$apr_memcache_includedir $CFLAGS"
    12777 
    12778 
    12779 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr_memcache_create in -lapr_memcache" >&5
    12780 $as_echo_n "checking for apr_memcache_create in -lapr_memcache... " >&6; }
    12781 if ${ac_cv_lib_apr_memcache_apr_memcache_create+:} false; then :
     12735if test -z "$apr_util_config"; then
     12736        for ac_prog in apu-1-config
     12737do
     12738  # Extract the first word of "$ac_prog", so it can be a program name with args.
     12739set dummy $ac_prog; ac_word=$2
     12740{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     12741$as_echo_n "checking for $ac_word... " >&6; }
     12742if ${ac_cv_path_APR_UTIL_CONF+:} false; then :
    1278212743  $as_echo_n "(cached) " >&6
    1278312744else
    12784   ac_check_lib_save_LIBS=$LIBS
    12785 LIBS="-lapr_memcache  $LIBS"
    12786 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    12787 /* end confdefs.h.  */
    12788 
    12789 /* Override any GCC internal prototype to avoid an error.
    12790    Use char because int might match the return type of a GCC
    12791    builtin and then its argument prototype would still apply.  */
    12792 #ifdef __cplusplus
    12793 extern "C"
    12794 #endif
    12795 char apr_memcache_create ();
    12796 int
    12797 main ()
    12798 {
    12799 return apr_memcache_create ();
    12800   ;
    12801   return 0;
    12802 }
    12803 _ACEOF
    12804 if ac_fn_c_try_link "$LINENO"; then :
    12805   ac_cv_lib_apr_memcache_apr_memcache_create=yes
    12806 else
    12807   ac_cv_lib_apr_memcache_apr_memcache_create=no
    12808 fi
    12809 rm -f core conftest.err conftest.$ac_objext \
    12810     conftest$ac_exeext conftest.$ac_ext
    12811 LIBS=$ac_check_lib_save_LIBS
    12812 fi
    12813 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apr_memcache_apr_memcache_create" >&5
    12814 $as_echo "$ac_cv_lib_apr_memcache_apr_memcache_create" >&6; }
    12815 if test "x$ac_cv_lib_apr_memcache_apr_memcache_create" = xyes; then :
    12816 
    12817         APR_MEMCACHE_LIBS="-lapr_memcache"
    12818         if test -n "$apr_memcache_libdir"; then
    12819             APR_MEMCACHE_LIBS="-R$apr_memcache_libdir -L$apr_memcache_libdir $APR_MEMCACHE_LIBS"
    12820         fi
    12821         APR_MEMCACHE_CFLAGS="-I$apr_memcache_includedir"
    12822 
    12823 
    12824 fi
    12825 
    12826 
    12827 
    12828 if test -z "${APR_MEMCACHE_LIBS}"; then
    12829     if test -n "$apr_memcache_includes"; then
    12830         apr_memcache_includedir=$apr_memcache_includes
    12831     elif test -n "$apr_memcache_prefix"; then
    12832         apr_memcache_includedir=$apr_memcache_prefix/include/aprutil-1
    12833     else
    12834         apr_memcache_includedir=$includedir/aprutil-1
    12835     fi
    12836     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr_memcache_create in -laprutil-1" >&5
     12745  case $APR_UTIL_CONF in
     12746  [\\/]* | ?:[\\/]*)
     12747  ac_cv_path_APR_UTIL_CONF="$APR_UTIL_CONF" # Let the user override the test with a path.
     12748  ;;
     12749  *)
     12750  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     12751as_dummy="$PATH:/usr/sbin"
     12752for as_dir in $as_dummy
     12753do
     12754  IFS=$as_save_IFS
     12755  test -z "$as_dir" && as_dir=.
     12756    for ac_exec_ext in '' $ac_executable_extensions; do
     12757  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     12758    ac_cv_path_APR_UTIL_CONF="$as_dir/$ac_word$ac_exec_ext"
     12759    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     12760    break 2
     12761  fi
     12762done
     12763  done
     12764IFS=$as_save_IFS
     12765
     12766  ;;
     12767esac
     12768fi
     12769APR_UTIL_CONF=$ac_cv_path_APR_UTIL_CONF
     12770if test -n "$APR_UTIL_CONF"; then
     12771  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $APR_UTIL_CONF" >&5
     12772$as_echo "$APR_UTIL_CONF" >&6; }
     12773else
     12774  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     12775$as_echo "no" >&6; }
     12776fi
     12777
     12778
     12779  test -n "$APR_UTIL_CONF" && break
     12780done
     12781test -n "$APR_UTIL_CONF" || APR_UTIL_CONF="no"
     12782
     12783else
     12784        { $as_echo "$as_me:${as_lineno-$LINENO}: using apu-1-config path set by user: $apr_util_config" >&5
     12785$as_echo "$as_me: using apu-1-config path set by user: $apr_util_config" >&6;}
     12786        APR_UTIL_CONF="$apr_util_config"
     12787fi
     12788
     12789CFLAGS="`$APR_UTIL_CONF --includes` $CFLAGS"
     12790LDFLAGS="`$APR_UTIL_CONF --link-ld` $LDFLAGS"
     12791
     12792{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr_memcache_create in -laprutil-1" >&5
    1283712793$as_echo_n "checking for apr_memcache_create in -laprutil-1... " >&6; }
    1283812794if ${ac_cv_lib_aprutil_1_apr_memcache_create+:} false; then :
     
    1287212828if test "x$ac_cv_lib_aprutil_1_apr_memcache_create" = xyes; then :
    1287312829
    12874             APR_MEMCACHE_LIBS="`apu-1-config --link-ld`"
    12875             APR_MEMCACHE_CFLAGS="`apu-1-config --includes`"
    12876 
    12877 
    12878 fi
     12830                APR_MEMCACHE_LIBS="`$APR_UTIL_CONF --link-ld`"
     12831                APR_MEMCACHE_CFLAGS="`$APR_UTIL_CONF --includes`"
     12832
    1287912833
    1288012834fi
     
    1302512979  *)
    1302612980  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    13027 for as_dir in $PATH
     12981as_dummy="$PATH:/usr/sbin"
     12982for as_dir in $as_dummy
    1302812983do
    1302912984  IFS=$as_save_IFS
     
    1362213577# values after options handling.
    1362313578ac_log="
    13624 This file was extended by mod_gnutls $as_me 0.7.1, which was
     13579This file was extended by mod_gnutls $as_me 0.7.2, which was
    1362513580generated by GNU Autoconf 2.69.  Invocation command line was
    1362613581
     
    1368813643ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    1368913644ac_cs_version="\\
    13690 mod_gnutls config.status 0.7.1
     13645mod_gnutls config.status 0.7.2
    1369113646configured by $0, generated by GNU Autoconf 2.69,
    1369213647  with options \\"\$ac_cs_config\\"
  • configure.ac

    r71cac80 r07cc51f  
    11dnl
    2 AC_INIT(mod_gnutls, 0.7.1)
     2AC_INIT(mod_gnutls, 0.7.2)
    33OOO_CONFIG_NICE(config.nice)
    44MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
     
    9999
    100100# Check for Apache binary
    101 AC_PATH_PROGS([APACHE2], [apache2 httpd], [no])
     101AC_PATH_PROGS([APACHE2], [apache2 httpd], [no], [$PATH:/usr/sbin])
    102102if test "${APACHE2}" = "no"; then
    103103        AC_MSG_WARN([Neither apache2 nor httpd found in \
  • doc/Makefile.in

    r4addf74 r02c8e54  
    1 # Makefile.in generated by automake 1.14.1 from Makefile.am.
     1# Makefile.in generated by automake 1.15 from Makefile.am.
    22# @configure_input@
    33
    4 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
     4# Copyright (C) 1994-2014 Free Software Foundation, Inc.
    55
    66# This Makefile.in is free software; the Free Software Foundation
     
    1616
    1717VPATH = @srcdir@
    18 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
     18am__is_gnu_make = { \
     19  if test -z '$(MAKELEVEL)'; then \
     20    false; \
     21  elif test -n '$(MAKE_HOST)'; then \
     22    true; \
     23  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     24    true; \
     25  else \
     26    false; \
     27  fi; \
     28}
    1929am__make_running_with_option = \
    2030  case $${target_option-} in \
     
    8191target_triplet = @target@
    8292subdir = doc
    83 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
    8493ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    8594am__aclocal_m4_deps = $(top_srcdir)/m4/apache.m4 \
     
    91100am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    92101        $(ACLOCAL_M4)
     102DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
    93103mkinstalldirs = $(install_sh) -d
    94104CONFIG_HEADER = $(top_builddir)/include/mod_gnutls_config.h
     
    144154DATA = $(html_DATA) $(pdf_DATA)
    145155am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
     156am__DIST_COMMON = $(srcdir)/Makefile.in
    146157DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    147158ACLOCAL = @ACLOCAL@
     
    157168APR_MEMCACHE_CFLAGS = @APR_MEMCACHE_CFLAGS@
    158169APR_MEMCACHE_LIBS = @APR_MEMCACHE_LIBS@
     170APR_UTIL_CONF = @APR_UTIL_CONF@
    159171APU_INCLUDES = @APU_INCLUDES@
    160172APU_LDFLAGS = @APU_LDFLAGS@
     
    326338        $(am__cd) $(top_srcdir) && \
    327339          $(AUTOMAKE) --gnu doc/Makefile
    328 .PRECIOUS: Makefile
    329340Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    330341        @case '$?' in \
     
    548559        uninstall-am uninstall-htmlDATA uninstall-pdfDATA
    549560
     561.PRECIOUS: Makefile
     562
    550563
    551564$(html_DATA) $(pdf_DATA): mod_gnutls_manual.mdwn
  • doc/mod_gnutls_manual.mdwn

    r9ca1f21 rdc058b8  
    2525    binary, not the directory it is located in.
    2626
    27 `--with-libgnutls=PATH`
    28 :   Full path to the libgnutls-config program.
    29 
    30 `--with-apr-memcache=PREFIX`
    31 :   Prefix to where apr\_memcache is installed.
     27`--with-apu-config=PATH`
     28:   Path to APR Utility Library config tool (`apu-1-config`)
    3229
    3330`--help`
    3431:   Provides a list of all available configure options.
     32
     33It is recommended to run `make check` before installation. If
     34`localhost` does not resolve to the IPv6 loopback address `[::1]` on
     35your system, you may have to set the `TEST_HOST` or `TEST_IP`
     36environment variables when running `./configure` to make the test
     37suite work correctly.
    3538
    3639* * * * *
  • m4/apr_memcache.m4

    r70509f8 rd6a575c  
    33dnl Sets:
    44dnl  APR_MEMCACHE_LIBS
     5dnl  APR_MEMCACHE_CFLAGS
    56AC_DEFUN([CHECK_APR_MEMCACHE],
    67[dnl
    78
    89AC_ARG_WITH(
    9     apr-memcache-prefix,
    10     [AC_HELP_STRING([--with-apr-memcache-prefix=PATH],[Install prefix for apr_memcache])],
    11     apr_memcache_prefix="$withval",
    12     :)
    13 AC_ARG_WITH(
    14     apr-memcache-libs,
    15     [AC_HELP_STRING([--with-apr-memcache-libs=PATH],[Path to apr_memcache libs])],
    16     apr_memcache_libs="$withval",
    17     :)
    18 AC_ARG_WITH(
    19     apr-memcache-includes,
    20     [AC_HELP_STRING([--with-apr-memcache-includes=PATH],[Path to apr_memcache includes])],
    21     apr_memcache_includes="$withval",
    22     :)
    23 
     10        [apu-config],
     11        [AC_HELP_STRING([--with-apu-config=PATH],[Path to APR Utility Library config tool (apu-1-config)])],
     12        [apr_util_config="$withval"],
     13        [])
    2414
    2515AC_LIBTOOL_SYS_DYNAMIC_LINKER
    2616
    27 dnl # Determine memcache lib directory
    2817save_CFLAGS=$CFLAGS
    2918save_LDFLAGS=$LDFLAGS
    3019
    31 if test -n "$apr_memcache_libs"; then
    32     apr_memcache_libdir=$apr_memcache_libs
    33 elif test -n "$apr_memcache_prefix"; then
    34     apr_memcache_libdir=$apr_memcache_prefix/lib
    35 fi
    36 if test -n "$apr_memcache_libdir"; then
    37     LDFLAGS="-L$apr_memcache_libdir $LDFLAGS"
     20dnl # If path to apu-1-config hasn't been set explicitly, try to find it
     21if test -z "$apr_util_config"; then
     22        AC_PATH_PROGS([APR_UTIL_CONF], [apu-1-config], [no], [$PATH:/usr/sbin])
     23else
     24        AC_MSG_NOTICE([using apu-1-config path set by user: $apr_util_config])
     25        APR_UTIL_CONF="$apr_util_config"
    3826fi
    3927
    40 if test -n "$apr_memcache_includes"; then
    41     apr_memcache_includedir=$apr_memcache_includes
    42 elif test -n "$apr_memcache_prefix"; then
    43     apr_memcache_includedir=$apr_memcache_prefix/include/apr_memcache-0
    44 else
    45     apr_memcache_includedir=$includedir/apr_memcache-0
    46 fi
    47 
    48 CFLAGS="-I$apr_memcache_includedir $CFLAGS"
    49 
     28CFLAGS="`$APR_UTIL_CONF --includes` $CFLAGS"
     29LDFLAGS="`$APR_UTIL_CONF --link-ld` $LDFLAGS"
    5030
    5131AC_CHECK_LIB(
    52     apr_memcache,
    53     apr_memcache_create,
    54     [
    55         APR_MEMCACHE_LIBS="-lapr_memcache"
    56         if test -n "$apr_memcache_libdir"; then
    57             APR_MEMCACHE_LIBS="-R$apr_memcache_libdir -L$apr_memcache_libdir $APR_MEMCACHE_LIBS"
    58         fi
    59         APR_MEMCACHE_CFLAGS="-I$apr_memcache_includedir"
    60     ]
    61 )
    62 
    63 
    64 dnl # if the apr_memcache was not found, try apr-util
    65 if test -z "${APR_MEMCACHE_LIBS}"; then
    66     if test -n "$apr_memcache_includes"; then
    67         apr_memcache_includedir=$apr_memcache_includes
    68     elif test -n "$apr_memcache_prefix"; then
    69         apr_memcache_includedir=$apr_memcache_prefix/include/aprutil-1
    70     else
    71         apr_memcache_includedir=$includedir/aprutil-1
    72     fi
    73     AC_CHECK_LIB(
    7432        aprutil-1,
    7533        apr_memcache_create,
    7634        [
    77             APR_MEMCACHE_LIBS="`apu-1-config --link-ld`"
    78             APR_MEMCACHE_CFLAGS="`apu-1-config --includes`"
     35                APR_MEMCACHE_LIBS="`$APR_UTIL_CONF --link-ld`"
     36                APR_MEMCACHE_CFLAGS="`$APR_UTIL_CONF --includes`"
    7937        ]
    80     )
    81 fi
    82 
     38)
    8339
    8440CFLAGS=$save_CFLAGS
  • src/Makefile.in

    r4addf74 r02c8e54  
    1 # Makefile.in generated by automake 1.14.1 from Makefile.am.
     1# Makefile.in generated by automake 1.15 from Makefile.am.
    22# @configure_input@
    33
    4 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
     4# Copyright (C) 1994-2014 Free Software Foundation, Inc.
    55
    66# This Makefile.in is free software; the Free Software Foundation
     
    1616
    1717VPATH = @srcdir@
    18 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
     18am__is_gnu_make = { \
     19  if test -z '$(MAKELEVEL)'; then \
     20    false; \
     21  elif test -n '$(MAKE_HOST)'; then \
     22    true; \
     23  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     24    true; \
     25  else \
     26    false; \
     27  fi; \
     28}
    1929am__make_running_with_option = \
    2030  case $${target_option-} in \
     
    8191target_triplet = @target@
    8292subdir = src
    83 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
    84         $(top_srcdir)/config/depcomp
    8593ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    8694am__aclocal_m4_deps = $(top_srcdir)/m4/apache.m4 \
     
    92100am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    93101        $(ACLOCAL_M4)
     102DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
    94103mkinstalldirs = $(install_sh) -d
    95104CONFIG_HEADER = $(top_builddir)/include/mod_gnutls_config.h
     
    199208ETAGS = etags
    200209CTAGS = ctags
     210am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
    201211DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    202212ACLOCAL = @ACLOCAL@
     
    212222APR_MEMCACHE_CFLAGS = @APR_MEMCACHE_CFLAGS@
    213223APR_MEMCACHE_LIBS = @APR_MEMCACHE_LIBS@
     224APR_UTIL_CONF = @APR_UTIL_CONF@
    214225APU_INCLUDES = @APU_INCLUDES@
    215226APU_LDFLAGS = @APU_LDFLAGS@
     
    381392        $(am__cd) $(top_srcdir) && \
    382393          $(AUTOMAKE) --gnu src/Makefile
    383 .PRECIOUS: Makefile
    384394Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    385395        @case '$?' in \
     
    716726        tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
    717727
     728.PRECIOUS: Makefile
     729
    718730
    719731make_so: $(lib_LTLIBRARIES)
  • src/gnutls_hooks.c

    rdff03fa ra2368a4  
    694694}
    695695
    696 /*
     696/**
    697697 * This function is intended as a cleanup handler for connections
    698  * using GnuTLS.
     698 * using GnuTLS. If attached to the connection pool, it ensures that
     699 * session resources are released with the connection pool even if the
     700 * session wasn't terminated properly.
    699701 *
    700702 * @param data must point to the mgs_handle_t associated with the
     
    711713    if (ctxt->session != NULL)
    712714    {
     715        ap_log_cerror(APLOG_MARK, APLOG_WARNING, APR_ECONNABORTED, ctxt->c,
     716                      "%s: connection pool cleanup in progress but %sTLS "
     717                      "session hasn't been terminated, trying to close",
     718                      __func__, IS_PROXY_STR(ctxt));
    713719        int ret;
    714720        /* Try A Clean Shutdown */
     
    717723        while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
    718724        if (ret != GNUTLS_E_SUCCESS)
    719             ap_log_cerror(APLOG_MARK, APLOG_INFO, ret, ctxt->c,
     725            ap_log_cerror(APLOG_MARK, APLOG_INFO, APR_EGENERAL, ctxt->c,
    720726                          "%s: error while closing TLS %sconnection: %s (%d)",
    721727                          __func__, IS_PROXY_STR(ctxt),
    722728                          gnutls_strerror(ret), ret);
    723729        else
    724             ap_log_cerror(APLOG_MARK, APLOG_DEBUG, ret, ctxt->c,
     730            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ctxt->c,
    725731                          "%s: TLS %sconnection closed.",
    726732                          __func__, IS_PROXY_STR(ctxt));
     
    775781                          "gnutls_session_ticket_enable_client failed: %s (%d)",
    776782                          gnutls_strerror(err), err);
    777         /* Try to close and deinit the session when the connection
    778          * pool is cleared. Note that mod_proxy might not close
    779          * connections immediately, if you need that, look at the
    780          * "proxy-nokeepalive" environment variable for
    781          * mod_proxy_http. */
    782         apr_pool_pre_cleanup_register(c->pool, ctxt, cleanup_gnutls_session);
    783783    }
    784784    else
     
    800800        }
    801801    }
     802
     803    /* Ensure TLS session resources are released when the connection
     804     * pool is cleared, if the filters haven't done that already. */
     805    apr_pool_pre_cleanup_register(c->pool, ctxt, cleanup_gnutls_session);
    802806
    803807    /* Set Default Priority */
  • src/gnutls_io.c

    rdfd5837 r73b0bf0  
    4242    ((c->is_proxy == GNUTLS_ENABLED_TRUE) ? "proxy " : "")
    4343
     44/**
     45 * Convert APR_EINTR or APR_EAGAIN to the match raw error code. Needed
     46 * to pass the status on to GnuTLS from the pull function.
     47 */
     48#define EAI_APR_TO_RAW(s) (APR_STATUS_IS_EAGAIN(s) ? EAGAIN : EINTR)
     49
     50
     51
    4452static apr_status_t gnutls_io_filter_error(ap_filter_t * f,
    4553        apr_bucket_brigade * bb,
     
    233241    }
    234242
    235     while (1) {
    236 
    237         do
    238             rc = gnutls_record_recv(ctxt->session, buf + bytes,
    239                                     wanted - bytes);
    240         while (rc == GNUTLS_E_INTERRUPTED || rc == GNUTLS_E_AGAIN);
     243    while (1)
     244    {
     245        rc = gnutls_record_recv(ctxt->session, buf + bytes, wanted - bytes);
     246
     247        if (rc == GNUTLS_E_INTERRUPTED)
     248            ctxt->input_rc = APR_EINTR;
     249        else if (rc == GNUTLS_E_AGAIN)
     250            ctxt->input_rc = APR_EAGAIN;
    241251
    242252        if (rc > 0) {
     
    486496}
    487497
     498
     499
     500/**
     501 * Close the TLS session associated with the given connection
     502 * structure and free its resources
     503 */
     504static int mgs_bye(mgs_handle_t* ctxt)
     505{
     506    int ret = GNUTLS_E_SUCCESS;
     507    /* End Of Connection */
     508    if (ctxt->session != NULL)
     509    {
     510        /* Try A Clean Shutdown */
     511        do {
     512            ret = gnutls_bye(ctxt->session, GNUTLS_SHUT_WR);
     513        } while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
     514        if (ret != GNUTLS_E_SUCCESS)
     515            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, APR_EGENERAL, ctxt->c,
     516                          "%s: Error while closing TLS %sconnection: "
     517                          "'%s' (%d)",
     518                          __func__, IS_PROXY_STR(ctxt),
     519                          gnutls_strerror(ret), (int) ret);
     520        else
     521            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ctxt->c,
     522                          "%s: TLS %sconnection closed.",
     523                          __func__, IS_PROXY_STR(ctxt));
     524        /* De-Initialize Session */
     525        gnutls_deinit(ctxt->session);
     526        ctxt->session = NULL;
     527    }
     528    return ret;
     529}
     530
     531
     532
    488533apr_status_t mgs_filter_input(ap_filter_t * f,
    489534        apr_bucket_brigade * bb,
     
    549594    }
    550595
    551     if (status != APR_SUCCESS) {
     596    if (status != APR_SUCCESS)
     597    {
     598        /* no data for nonblocking read, return APR_EAGAIN */
     599        if ((block == APR_NONBLOCK_READ) && APR_STATUS_IS_EINTR(status))
     600            return APR_EAGAIN;
     601
     602        /* Close TLS session and free resources on EOF,
     603         * gnutls_io_filter_error will add an EOS bucket */
     604        if (APR_STATUS_IS_EOF(status))
     605            mgs_bye(ctxt);
     606
    552607        return gnutls_io_filter_error(f, bb, status);
    553608    }
     
    633688            apr_bucket_delete(bucket);
    634689        } else if (AP_BUCKET_IS_EOC(bucket)) {
    635             /* End Of Connection */
    636             if (ctxt->session != NULL) {
    637                 /* Try A Clean Shutdown */
    638                 do {
    639                     ret = gnutls_bye(ctxt->session, GNUTLS_SHUT_WR);
    640                 } while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
    641                 if (ret != GNUTLS_E_SUCCESS)
    642                     ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctxt->c,
    643                                   "%s: Error while closing TLS %sconnection: "
    644                                   "'%s' (%d)",
    645                                   __func__, IS_PROXY_STR(ctxt),
    646                                   gnutls_strerror(ret), (int) ret);
    647                 else
    648                     ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctxt->c,
    649                                   "%s: TLS %sconnection closed.",
    650                                   __func__, IS_PROXY_STR(ctxt));
    651                 /* De-Initialize Session */
    652                 gnutls_deinit(ctxt->session);
    653                 ctxt->session = NULL;
    654             }
     690            /* End Of Connection, close TLS session and free
     691             * resources */
     692            mgs_bye(ctxt);
    655693            /* cleanup! */
    656694            apr_bucket_delete(bucket);
     
    725763}
    726764
     765/**
     766 * Pull function for GnuTLS
     767 */
    727768ssize_t mgs_transport_read(gnutls_transport_ptr_t ptr,
    728         void *buffer, size_t len) {
     769                           void *buffer, size_t len)
     770{
    729771    mgs_handle_t *ctxt = ptr;
    730772    apr_status_t rc;
     
    752794         */
    753795        if (APR_STATUS_IS_EAGAIN(rc) || APR_STATUS_IS_EINTR(rc)
    754                 || (rc == APR_SUCCESS
    755                 && APR_BRIGADE_EMPTY(ctxt->input_bb))) {
    756 
    757             if (APR_STATUS_IS_EOF(ctxt->input_rc)) {
     796            || (rc == APR_SUCCESS
     797                && APR_BRIGADE_EMPTY(ctxt->input_bb)))
     798        {
     799            if (APR_STATUS_IS_EOF(ctxt->input_rc))
     800            {
    758801                return 0;
    759             } else {
     802            }
     803            else
     804            {
    760805                if (ctxt->session)
    761                     gnutls_transport_set_errno(ctxt->
    762                         session,
    763                         EINTR);
     806                    gnutls_transport_set_errno(ctxt->session,
     807                                               EAI_APR_TO_RAW(ctxt->input_rc));
    764808                return -1;
    765809            }
    766810        }
    767 
    768811
    769812        if (rc != APR_SUCCESS) {
     
    783826
    784827    if (APR_STATUS_IS_EAGAIN(ctxt->input_rc)
    785             || APR_STATUS_IS_EINTR(ctxt->input_rc)) {
    786         if (len == 0) {
     828        || APR_STATUS_IS_EINTR(ctxt->input_rc))
     829    {
     830        if (len == 0)
     831        {
    787832            if (ctxt->session)
    788833                gnutls_transport_set_errno(ctxt->session,
    789                     EINTR);
     834                                           EAI_APR_TO_RAW(ctxt->input_rc));
    790835            return -1;
    791836        }
  • test/Makefile.am

    rfc8e463 ra61edfd  
    134134# port for MSVA in test cases that use it
    135135MSVA_PORT ?= 9933
    136 # maximum time to wait for MSVA startup
    137 TEST_MSVA_MAX_WAIT ?= 10
    138 # wait loop time for MSVA startup
    139 TEST_MSVA_WAIT ?= 0.4
     136# maximum time to wait for MSVA startup (milliseconds)
     137TEST_MSVA_MAX_WAIT ?= 10000
     138# wait loop time for MSVA startup (milliseconds)
     139TEST_MSVA_WAIT ?= 400
    140140# seconds for the HTTP request to be sent and responded to
    141141TEST_QUERY_DELAY ?= 30
  • test/Makefile.in

    r89f863f r02c8e54  
    1 # Makefile.in generated by automake 1.14.1 from Makefile.am.
     1# Makefile.in generated by automake 1.15 from Makefile.am.
    22# @configure_input@
    33
    4 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
     4# Copyright (C) 1994-2014 Free Software Foundation, Inc.
    55
    66# This Makefile.in is free software; the Free Software Foundation
     
    2323# for the test suite
    2424VPATH = @srcdir@
    25 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
     25am__is_gnu_make = { \
     26  if test -z '$(MAKELEVEL)'; then \
     27    false; \
     28  elif test -n '$(MAKE_HOST)'; then \
     29    true; \
     30  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     31    true; \
     32  else \
     33    false; \
     34  fi; \
     35}
    2636am__make_running_with_option = \
    2737  case $${target_option-} in \
     
    8898target_triplet = @target@
    8999@USE_MSVA_TRUE@am__append_1 = test-15_basic_msva.bash
    90 DIST_COMMON = $(srcdir)/test_ca.mk $(srcdir)/Makefile.in \
    91         $(srcdir)/Makefile.am $(am__dist_check_SCRIPTS_DIST) \
    92         $(top_srcdir)/config/test-driver README
    93100@USE_MSVA_TRUE@am__append_2 = $(msva_home)/trustdb.gpg client.uid
    94101@USE_MSVA_TRUE@am__append_3 = $(msva_home)/trustdb.gpg
     
    103110am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    104111        $(ACLOCAL_M4)
     112DIST_COMMON = $(srcdir)/Makefile.am $(am__dist_check_SCRIPTS_DIST) \
     113        $(am__DIST_COMMON)
    105114mkinstalldirs = $(install_sh) -d
    106115CONFIG_HEADER = $(top_builddir)/include/mod_gnutls_config.h
     
    385394        $(TEST_LOG_FLAGS)
    386395DIST_SUBDIRS = $(SUBDIRS)
     396am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/test_ca.mk \
     397        $(top_srcdir)/config/test-driver README
    387398DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    388399am__relativize = \
     
    423434APR_MEMCACHE_CFLAGS = @APR_MEMCACHE_CFLAGS@
    424435APR_MEMCACHE_LIBS = @APR_MEMCACHE_LIBS@
     436APR_UTIL_CONF = @APR_UTIL_CONF@
    425437APU_INCLUDES = @APU_INCLUDES@
    426438APU_LDFLAGS = @APU_LDFLAGS@
     
    695707        $(am__cd) $(top_srcdir) && \
    696708          $(AUTOMAKE) --gnu test/Makefile
    697 .PRECIOUS: Makefile
    698709Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    699710        @case '$?' in \
     
    704715            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
    705716        esac;
    706 $(srcdir)/test_ca.mk:
     717$(srcdir)/test_ca.mk $(am__empty):
    707718
    708719$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
     
    850861          echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
    851862               "recursion detected" >&2; \
    852         else \
     863        elif test -n "$$redo_logs"; then \
    853864          am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
    854865        fi; \
     
    13301341        recheck tags tags-am uninstall uninstall-am
    13311342
     1343.PRECIOUS: Makefile
     1344
    13321345
    13331346%.template: $(srcdir)/%.template.in
     
    13691382        certtool --generate-self-signed --load-privkey rogueca/secret.key --template $(srcdir)/rogueca.template > $@
    13701383
    1371 %/cert-request: %.template %/secret.key 
     1384%/cert-request: %.template %/secret.key
    13721385        certtool --generate-request --load-privkey $(dir $@)secret.key --template $< > $@
    13731386
    1374 %/x509.pem: %.template %/cert-request authority/secret.key authority/x509.pem 
     1387%/x509.pem: %.template %/cert-request authority/secret.key authority/x509.pem
    13751388        certtool --generate-certificate --load-ca-certificate authority/x509.pem --load-ca-privkey authority/secret.key --load-request $(dir $@)cert-request --template $< > $@
    13761389
     
    14081421# port for MSVA in test cases that use it
    14091422MSVA_PORT ?= 9933
    1410 # maximum time to wait for MSVA startup
    1411 TEST_MSVA_MAX_WAIT ?= 10
    1412 # wait loop time for MSVA startup
    1413 TEST_MSVA_WAIT ?= 0.4
     1423# maximum time to wait for MSVA startup (milliseconds)
     1424TEST_MSVA_MAX_WAIT ?= 10000
     1425# wait loop time for MSVA startup (milliseconds)
     1426TEST_MSVA_WAIT ?= 400
    14141427# seconds for the HTTP request to be sent and responded to
    14151428TEST_QUERY_DELAY ?= 30
  • test/runtests

    r34e5dc7 ra61edfd  
    124124    ret=1
    125125    export MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT"
    126     # wait at most TEST_MSVA_MAX_WAIT seconds for MSVA to get ready
    127     waited=0.0
     126
     127    # convert TEST_MSVA_WAIT to seconds because that's what "sleep" expects
     128    TEST_MSVA_SLEEP="$((${TEST_MSVA_WAIT} / 1000)).$((${TEST_MSVA_WAIT} % 1000))"
     129    # wait at most TEST_MSVA_MAX_WAIT milliseconds for MSVA to get ready
     130    waited=0
    128131    until [ ${ret} -eq 0 ] \
    129               || [ $(echo "${waited} > ${TEST_MSVA_MAX_WAIT}" | bc) -eq 1 ]; do
     132              || [ ${waited} -ge ${TEST_MSVA_MAX_WAIT} ]; do
    130133        if msva-query-agent https "$(cat client.uid)" x509pem client < client/x509.pem
    131134        then
     
    134137            echo "MSVA not ready yet"
    135138        fi
    136         sleep "${TEST_MSVA_WAIT}"
    137         waited=$(echo "${waited} + ${TEST_MSVA_WAIT}" | bc)
     139        sleep "${TEST_MSVA_SLEEP}"
     140        waited=$((${waited} + ${TEST_MSVA_WAIT}))
    138141    done
    139142
  • test/test_ca.mk

    rfc8e463 ra63301f  
    4545        certtool --generate-self-signed --load-privkey rogueca/secret.key --template $(srcdir)/rogueca.template > $@
    4646
    47 %/cert-request: %.template %/secret.key 
     47%/cert-request: %.template %/secret.key
    4848        certtool --generate-request --load-privkey $(dir $@)secret.key --template $< > $@
    4949
    50 %/x509.pem: %.template %/cert-request authority/secret.key authority/x509.pem 
     50%/x509.pem: %.template %/cert-request authority/secret.key authority/x509.pem
    5151        certtool --generate-certificate --load-ca-certificate authority/x509.pem --load-ca-privkey authority/secret.key --load-request $(dir $@)cert-request --template $< > $@
    5252
  • test/tests/Makefile.in

    r4addf74 r02c8e54  
    1 # Makefile.in generated by automake 1.14.1 from Makefile.am.
     1# Makefile.in generated by automake 1.15 from Makefile.am.
    22# @configure_input@
    33
    4 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
     4# Copyright (C) 1994-2014 Free Software Foundation, Inc.
    55
    66# This Makefile.in is free software; the Free Software Foundation
     
    1515@SET_MAKE@
    1616VPATH = @srcdir@
    17 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
     17am__is_gnu_make = { \
     18  if test -z '$(MAKELEVEL)'; then \
     19    false; \
     20  elif test -n '$(MAKE_HOST)'; then \
     21    true; \
     22  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     23    true; \
     24  else \
     25    false; \
     26  fi; \
     27}
    1828am__make_running_with_option = \
    1929  case $${target_option-} in \
     
    8090target_triplet = @target@
    8191subdir = test/tests
    82 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
    8392ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    8493am__aclocal_m4_deps = $(top_srcdir)/m4/apache.m4 \
     
    9099am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    91100        $(ACLOCAL_M4)
     101DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
    92102mkinstalldirs = $(install_sh) -d
    93103CONFIG_HEADER = $(top_builddir)/include/mod_gnutls_config.h
     
    114124  esac
    115125am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
     126am__DIST_COMMON = $(srcdir)/Makefile.in
    116127DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    117128ACLOCAL = @ACLOCAL@
     
    127138APR_MEMCACHE_CFLAGS = @APR_MEMCACHE_CFLAGS@
    128139APR_MEMCACHE_LIBS = @APR_MEMCACHE_LIBS@
     140APR_UTIL_CONF = @APR_UTIL_CONF@
    129141APU_INCLUDES = @APU_INCLUDES@
    130142APU_LDFLAGS = @APU_LDFLAGS@
     
    317329        $(am__cd) $(top_srcdir) && \
    318330          $(AUTOMAKE) --gnu test/tests/Makefile
    319 .PRECIOUS: Makefile
    320331Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    321332        @case '$?' in \
     
    492503        tags-am uninstall uninstall-am
    493504
     505.PRECIOUS: Makefile
     506
    494507
    495508# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.