Changeset 9c4a7444 in mod_gnutls
- Timestamp:
- Jan 11, 2013, 12:58:11 AM (10 years ago)
- Branches:
- debian/master, debian/stretch-backports, jessie-backports
- Children:
- 619c6bf
- Parents:
- ae015fa (diff), 5508683 (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. - Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile.in
rae015fa r9c4a7444 1 # Makefile.in generated by automake 1.11 from Makefile.am.1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 347 347 # (2) otherwise, pass the desired values on the `make' command line. 348 348 $(RECURSIVE_TARGETS): 349 @fail com='exit 1'; \349 @fail= failcom='exit 1'; \ 350 350 for f in x $$MAKEFLAGS; do \ 351 351 case $$f in \ … … 372 372 373 373 $(RECURSIVE_CLEAN_TARGETS): 374 @fail com='exit 1'; \374 @fail= failcom='exit 1'; \ 375 375 for f in x $$MAKEFLAGS; do \ 376 376 case $$f in \ … … 536 536 done 537 537 -test -n "$(am__skip_mode_fix)" \ 538 || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ 538 || find "$(distdir)" -type d ! -perm -755 \ 539 -exec chmod u+rwx,go+rx {} \; -o \ 539 540 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ 540 541 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ … … 580 581 case '$(DIST_ARCHIVES)' in \ 581 582 *.tar.gz*) \ 582 GZIP=$(GZIP_ENV) g unzip -c $(distdir).tar.gz | $(am__untar) ;;\583 GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ 583 584 *.tar.bz2*) \ 584 b unzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\585 bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ 585 586 *.tar.lzma*) \ 586 unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\587 lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ 587 588 *.tar.xz*) \ 588 589 xz -dc $(distdir).tar.xz | $(am__untar) ;;\ … … 590 591 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ 591 592 *.shar.gz*) \ 592 GZIP=$(GZIP_ENV) g unzip -c $(distdir).shar.gz | unshar ;;\593 GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ 593 594 *.zip*) \ 594 595 unzip $(distdir).zip ;;\ -
NEWS
rae015fa r9c4a7444 1 ** Version 0.5.8 (2010-08-18) 2 - Session tickets are enabled by default. 3 4 - Fixes some segmentation faults noticed in some 5 configurations. 6 1 7 ** Version 0.5.7 (2010-07-01) 2 8 - Force usage of SDBM. For some reason the default in -
aclocal.m4
rae015fa r9c4a7444 1 # generated automatically by aclocal 1.11 -*- Autoconf -*-1 # generated automatically by aclocal 1.11.1 -*- Autoconf -*- 2 2 3 3 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, … … 14 14 m4_ifndef([AC_AUTOCONF_VERSION], 15 15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 16 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.6 4],,17 [m4_warning([this file was generated for autoconf 2.6 4.16 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, 17 [m4_warning([this file was generated for autoconf 2.65. 18 18 You have another version of autoconf. It may work, but is not guaranteed to. 19 19 If you have problems, you may need to regenerate the build system entirely. … … 35 35 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to 36 36 dnl require some minimum version. Point them to the right macro. 37 m4_if([$1], [1.11 ], [],37 m4_if([$1], [1.11.1], [], 38 38 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl 39 39 ]) … … 51 51 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. 52 52 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 53 [AM_AUTOMAKE_VERSION([1.11 ])dnl53 [AM_AUTOMAKE_VERSION([1.11.1])dnl 54 54 m4_ifndef([AC_AUTOCONF_VERSION], 55 55 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -
config/config.guess
rae015fa r9c4a7444 2 2 # Attempt to guess a canonical system name. 3 3 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 4 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 4 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 5 5 # Free Software Foundation, Inc. 6 6 7 timestamp='2009-0 4-27'7 timestamp='2009-06-10' 8 8 9 9 # This file is free software; you can redistribute it and/or modify it … … 171 171 eval $set_cc_for_build 172 172 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ 173 | grep __ELF__ >/dev/null173 | grep -q __ELF__ 174 174 then 175 175 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). … … 657 657 658 658 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | 659 grep __LP64__ >/dev/null659 grep -q __LP64__ 660 660 then 661 661 HP_ARCH="hppa2.0w" … … 823 823 echo i${UNAME_MACHINE}-pc-mks 824 824 exit ;; 825 8664:Windows_NT:*) 826 echo x86_64-pc-mks 827 exit ;; 825 828 i*:Windows_NT*:* | Pentium*:Windows_NT*:*) 826 829 # How do we know it's Interix rather than the generic POSIX subsystem? … … 883 886 echo ${UNAME_MACHINE}-unknown-linux-gnu 884 887 exit ;; 885 mips:Linux:*:* )888 mips:Linux:*:* | mips64:Linux:*:*) 886 889 eval $set_cc_for_build 887 890 sed 's/^ //' << EOF >$dummy.c 888 891 #undef CPU 889 #undef mips890 #undef mipsel892 #undef ${UNAME_MACHINE} 893 #undef ${UNAME_MACHINE}el 891 894 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 892 CPU= mipsel895 CPU=${UNAME_MACHINE}el 893 896 #else 894 897 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 895 CPU=mips 896 #else 897 CPU= 898 #endif 899 #endif 900 EOF 901 eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' 902 /^CPU/{ 903 s: ::g 904 p 905 }'`" 906 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 907 ;; 908 mips64:Linux:*:*) 909 eval $set_cc_for_build 910 sed 's/^ //' << EOF >$dummy.c 911 #undef CPU 912 #undef mips64 913 #undef mips64el 914 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 915 CPU=mips64el 916 #else 917 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 918 CPU=mips64 898 CPU=${UNAME_MACHINE} 919 899 #else 920 900 CPU= … … 948 928 EV68*) UNAME_MACHINE=alphaev68 ;; 949 929 esac 950 objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null930 objdump --private-headers /bin/sh | grep -q ld.so.1 951 931 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi 952 932 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} … … 1002 982 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" 1003 983 ;; 1004 a.out-i386-linux)1005 echo "${UNAME_MACHINE}-pc-linux-gnuaout"1006 exit ;;1007 "")1008 # Either a pre-BFD a.out linker (linux-gnuoldld) or1009 # one that does not give us useful --help.1010 echo "${UNAME_MACHINE}-pc-linux-gnuoldld"1011 exit ;;1012 984 esac 1013 985 # Determine whether the default compiler is a.out or elf … … 1075 1047 echo ${UNAME_MACHINE}-pc-syllable 1076 1048 exit ;; 1077 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4. 0*:*)1049 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) 1078 1050 echo i386-unknown-lynxos${UNAME_RELEASE} 1079 1051 exit ;; … … 1183 1155 echo rs6000-unknown-lynxos${UNAME_RELEASE} 1184 1156 exit ;; 1185 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4. 0*:*)1157 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) 1186 1158 echo powerpc-unknown-lynxos${UNAME_RELEASE} 1187 1159 exit ;; -
config/config.sub
rae015fa r9c4a7444 2 2 # Configuration validation subroutine script. 3 3 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 4 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 4 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 5 5 # Free Software Foundation, Inc. 6 6 7 timestamp='2009-0 4-17'7 timestamp='2009-06-11' 8 8 9 9 # This file is (in principle) common to ALL GNU software. … … 153 153 os= 154 154 basic_machine=$1 155 ;; 156 -bluegene*) 157 os=-cnk 155 158 ;; 156 159 -sim | -cisco | -oki | -wec | -winbond) … … 468 471 os=-linux 469 472 ;; 473 bluegene*) 474 basic_machine=powerpc-ibm 475 os=-cnk 476 ;; 470 477 c90) 471 478 basic_machine=c90-cray … … 1261 1268 # -sysv* is not here because it comes later, after sysvr4. 1262 1269 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ 1263 | -*vms* | -sco* | -esix* | -isc* | -aix* | - sunos | -sunos[34]*\1270 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ 1264 1271 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ 1265 1272 | -kopensolaris* \ … … 1614 1621 vendor=sun 1615 1622 ;; 1616 - aix*)1623 -cnk*|-aix*) 1617 1624 vendor=ibm 1618 1625 ;; -
config/ltmain.sh
rae015fa r9c4a7444 1 1 # Generated from ltmain.m4sh. 2 2 3 # ltmain.sh (GNU libtool) 2.2.6 3 # ltmain.sh (GNU libtool) 2.2.6b 4 4 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 5 5 … … 66 66 # compiler flags: $LTCFLAGS 67 67 # linker: $LD (gnu? $with_gnu_ld) 68 # $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-468 # $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 69 69 # automake: $automake_version 70 70 # autoconf: $autoconf_version … … 74 74 PROGRAM=ltmain.sh 75 75 PACKAGE=libtool 76 VERSION="2.2.6 Debian-2.2.6a-4"76 VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" 77 77 TIMESTAMP="" 78 package_revision=1.301 278 package_revision=1.3017 79 79 80 80 # Be Bourne compatible -
configure
rae015fa r9c4a7444 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.64 for mod_gnutls 0.5.7. 3 # Generated by GNU Autoconf 2.65 for mod_gnutls 0.5.8. 4 # 4 5 # 5 6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 6 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software 7 # Foundation, Inc. 7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 8 # Inc. 9 # 8 10 # 9 11 # This configure script is free software; the Free Software Foundation … … 674 676 675 677 676 exec 7<&0 </dev/null 6>&1 678 test -n "$DJDIR" || exec 7<&0 </dev/null 679 exec 6>&1 677 680 678 681 # Name of the host. … … 696 699 PACKAGE_NAME='mod_gnutls' 697 700 PACKAGE_TARNAME='mod_gnutls' 698 PACKAGE_VERSION='0.5. 7'699 PACKAGE_STRING='mod_gnutls 0.5. 7'701 PACKAGE_VERSION='0.5.8' 702 PACKAGE_STRING='mod_gnutls 0.5.8' 700 703 PACKAGE_BUGREPORT='' 701 704 PACKAGE_URL='' … … 1462 1465 # This message is too long to be a string in the A/UX 3.1 sh. 1463 1466 cat <<_ACEOF 1464 \`configure' configures mod_gnutls 0.5. 7to adapt to many kinds of systems.1467 \`configure' configures mod_gnutls 0.5.8 to adapt to many kinds of systems. 1465 1468 1466 1469 Usage: $0 [OPTION]... [VAR=VALUE]... … … 1533 1536 if test -n "$ac_init_help"; then 1534 1537 case $ac_init_help in 1535 short | recursive ) echo "Configuration of mod_gnutls 0.5. 7:";;1538 short | recursive ) echo "Configuration of mod_gnutls 0.5.8:";; 1536 1539 esac 1537 1540 cat <<\_ACEOF … … 1576 1579 nonstandard directory <lib dir> 1577 1580 LIBS libraries to pass to the linker, e.g. -l<library> 1578 CPPFLAGS C/C++/Objective Cpreprocessor flags, e.g. -I<include dir> if1581 CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if 1579 1582 you have headers in a nonstandard directory <include dir> 1580 1583 CPP C preprocessor … … 1646 1649 if $ac_init_version; then 1647 1650 cat <<\_ACEOF 1648 mod_gnutls configure 0.5. 71649 generated by GNU Autoconf 2.6 41651 mod_gnutls configure 0.5.8 1652 generated by GNU Autoconf 2.65 1650 1653 1651 1654 Copyright (C) 2009 Free Software Foundation, Inc. … … 1694 1697 fi 1695 1698 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1696 return$ac_retval1699 as_fn_set_status $ac_retval 1697 1700 1698 1701 } # ac_fn_c_try_compile … … 1740 1743 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 1741 1744 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1742 return$ac_retval1745 as_fn_set_status $ac_retval 1743 1746 1744 1747 } # ac_fn_c_try_link … … 1808 1811 fi 1809 1812 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1810 return$ac_retval1813 as_fn_set_status $ac_retval 1811 1814 1812 1815 } # ac_fn_c_try_cpp … … 1850 1853 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 1851 1854 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1852 return$ac_retval1855 as_fn_set_status $ac_retval 1853 1856 1854 1857 } # ac_fn_c_try_run … … 1963 1966 running configure, to aid debugging if configure makes a mistake. 1964 1967 1965 It was created by mod_gnutls $as_me 0.5. 7, which was1966 generated by GNU Autoconf 2.6 4. Invocation command line was1968 It was created by mod_gnutls $as_me 0.5.8, which was 1969 generated by GNU Autoconf 2.65. Invocation command line was 1967 1970 1968 1971 $ $0 $@ … … 2217 2220 do 2218 2221 test "x$ac_site_file" = xNONE && continue 2219 if test -r "$ac_site_file"; then2222 if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then 2220 2223 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 2221 2224 $as_echo "$as_me: loading site script $ac_site_file" >&6;} … … 2226 2229 2227 2230 if test -r "$cache_file"; then 2228 # Some versions of bash will fail to source /dev/null (special 2229 # files actually), so we avoid doing that.2230 if test -f "$cache_file"; then2231 # Some versions of bash will fail to source /dev/null (special files 2232 # actually), so we avoid doing that. DJGPP emulates it as a regular file. 2233 if test /dev/null != "$cache_file" && test -f "$cache_file"; then 2231 2234 { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 2232 2235 $as_echo "$as_me: loading cache $cache_file" >&6;} … … 2328 2331 chmod +x config.nice 2329 2332 2330 MOD_GNUTLS_VERSION=0.5. 72333 MOD_GNUTLS_VERSION=0.5.8 2331 2334 2332 2335 … … 2814 2817 fi 2815 2818 2819 test -d ./--version && rmdir ./--version 2816 2820 if test "${ac_cv_path_mkdir+set}" = set; then 2817 2821 MKDIR_P="$ac_cv_path_mkdir -p" … … 2821 2825 # break other packages using the cache if that directory is 2822 2826 # removed, or if the value is a relative name. 2823 test -d ./--version && rmdir ./--version2824 2827 MKDIR_P="$ac_install_sh -d" 2825 2828 fi … … 2938 2941 # Define the identity of the package. 2939 2942 PACKAGE=mod_gnutls 2940 VERSION=0.5. 72943 VERSION=0.5.8 2941 2944 2942 2945 … … 3305 3308 10q' conftest.err >conftest.er1 3306 3309 cat conftest.er1 >&5 3307 rm -f conftest.er1 conftest.err3308 3310 fi 3311 rm -f conftest.er1 conftest.err 3309 3312 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 3310 3313 test $ac_status = 0; } … … 3313 3316 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3314 3317 /* end confdefs.h. */ 3315 #include <stdio.h> 3318 3316 3319 int 3317 3320 main () 3318 3321 { 3319 FILE *f = fopen ("conftest.out", "w");3320 return ferror (f) || fclose (f) != 0;3321 3322 3322 3323 ; … … 3325 3326 _ACEOF 3326 3327 ac_clean_files_save=$ac_clean_files 3327 ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"3328 ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" 3328 3329 # Try to create an executable without -o first, disregard a.out. 3329 3330 # It will help us diagnose broken compilers, and finding out an intuition 3330 3331 # of exeext. 3331 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&53332 $as_echo_n "checking for C compiler default output file name... " >&6; }3332 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 3333 $as_echo_n "checking whether the C compiler works... " >&6; } 3333 3334 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` 3334 3335 … … 3392 3393 ac_file='' 3393 3394 fi 3394 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&53395 $as_echo "$ac_file" >&6; }3396 3395 if test -z "$ac_file"; then : 3397 $as_echo "$as_me: failed program was:" >&5 3396 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 3397 $as_echo "no" >&6; } 3398 $as_echo "$as_me: failed program was:" >&5 3398 3399 sed 's/^/| /' conftest.$ac_ext >&5 3399 3400 … … 3403 3404 as_fn_error "C compiler cannot create executables 3404 3405 See \`config.log' for more details." "$LINENO" 5; }; } 3405 fi 3406 else 3407 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 3408 $as_echo "yes" >&6; } 3409 fi 3410 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 3411 $as_echo_n "checking for C compiler default output file name... " >&6; } 3412 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 3413 $as_echo "$ac_file" >&6; } 3406 3414 ac_exeext=$ac_cv_exeext 3407 3415 3408 # Check that the compiler produces executables we can run. If not, either 3409 # the compiler is broken, or we cross compile. 3410 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 3411 $as_echo_n "checking whether the C compiler works... " >&6; } 3412 # If not cross compiling, check that we can run a simple program. 3413 if test "$cross_compiling" != yes; then 3414 if { ac_try='./$ac_file' 3415 { { case "(($ac_try" in 3416 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 3417 *) ac_try_echo=$ac_try;; 3418 esac 3419 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 3420 $as_echo "$ac_try_echo"; } >&5 3421 (eval "$ac_try") 2>&5 3422 ac_status=$? 3423 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 3424 test $ac_status = 0; }; }; then 3425 cross_compiling=no 3426 else 3427 if test "$cross_compiling" = maybe; then 3428 cross_compiling=yes 3429 else 3430 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3431 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3432 as_fn_error "cannot run C compiled programs. 3433 If you meant to cross compile, use \`--host'. 3434 See \`config.log' for more details." "$LINENO" 5; } 3435 fi 3436 fi 3437 fi 3438 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 3439 $as_echo "yes" >&6; } 3440 3441 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out 3416 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out 3442 3417 ac_clean_files=$ac_clean_files_save 3443 # Check that the compiler produces executables we can run. If not, either3444 # the compiler is broken, or we cross compile.3445 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&53446 $as_echo_n "checking whether we are cross compiling... " >&6; }3447 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&53448 $as_echo "$cross_compiling" >&6; }3449 3450 3418 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 3451 3419 $as_echo_n "checking for suffix of executables... " >&6; } … … 3480 3448 See \`config.log' for more details." "$LINENO" 5; } 3481 3449 fi 3482 rm -f conftest $ac_cv_exeext3450 rm -f conftest conftest$ac_cv_exeext 3483 3451 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 3484 3452 $as_echo "$ac_cv_exeext" >&6; } … … 3487 3455 EXEEXT=$ac_cv_exeext 3488 3456 ac_exeext=$EXEEXT 3457 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3458 /* end confdefs.h. */ 3459 #include <stdio.h> 3460 int 3461 main () 3462 { 3463 FILE *f = fopen ("conftest.out", "w"); 3464 return ferror (f) || fclose (f) != 0; 3465 3466 ; 3467 return 0; 3468 } 3469 _ACEOF 3470 ac_clean_files="$ac_clean_files conftest.out" 3471 # Check that the compiler produces executables we can run. If not, either 3472 # the compiler is broken, or we cross compile. 3473 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 3474 $as_echo_n "checking whether we are cross compiling... " >&6; } 3475 if test "$cross_compiling" != yes; then 3476 { { ac_try="$ac_link" 3477 case "(($ac_try" in 3478 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 3479 *) ac_try_echo=$ac_try;; 3480 esac 3481 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 3482 $as_echo "$ac_try_echo"; } >&5 3483 (eval "$ac_link") 2>&5 3484 ac_status=$? 3485 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 3486 test $ac_status = 0; } 3487 if { ac_try='./conftest$ac_cv_exeext' 3488 { { case "(($ac_try" in 3489 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 3490 *) ac_try_echo=$ac_try;; 3491 esac 3492 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 3493 $as_echo "$ac_try_echo"; } >&5 3494 (eval "$ac_try") 2>&5 3495 ac_status=$? 3496 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 3497 test $ac_status = 0; }; }; then 3498 cross_compiling=no 3499 else 3500 if test "$cross_compiling" = maybe; then 3501 cross_compiling=yes 3502 else 3503 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3504 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3505 as_fn_error "cannot run C compiled programs. 3506 If you meant to cross compile, use \`--host'. 3507 See \`config.log' for more details." "$LINENO" 5; } 3508 fi 3509 fi 3510 fi 3511 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 3512 $as_echo "$cross_compiling" >&6; } 3513 3514 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out 3515 ac_clean_files=$ac_clean_files_save 3489 3516 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 3490 3517 $as_echo_n "checking for suffix of object files... " >&6; } … … 4358 4385 4359 4386 4360 macro_version='2.2.6 '4361 macro_revision='1.301 2'4387 macro_version='2.2.6b' 4388 macro_revision='1.3017' 4362 4389 4363 4390 … … 4549 4576 lt_cv_nm_interface="BSD nm" 4550 4577 echo "int some_variable = 0;" > conftest.$ac_ext 4551 (eval echo "\"\$as_me:45 51: $ac_compile\"" >&5)4578 (eval echo "\"\$as_me:4578: $ac_compile\"" >&5) 4552 4579 (eval "$ac_compile" 2>conftest.err) 4553 4580 cat conftest.err >&5 4554 (eval echo "\"\$as_me:45 54: $NM \\\"conftest.$ac_objext\\\"\"" >&5)4581 (eval echo "\"\$as_me:4581: $NM \\\"conftest.$ac_objext\\\"\"" >&5) 4555 4582 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) 4556 4583 cat conftest.err >&5 4557 (eval echo "\"\$as_me:45 57: output\"" >&5)4584 (eval echo "\"\$as_me:4584: output\"" >&5) 4558 4585 cat conftest.out >&5 4559 4586 if $GREP 'External.*some_variable' conftest.out > /dev/null; then … … 5021 5048 5022 5049 # This must be Linux ELF. 5023 linux* | k*bsd*-gnu )5050 linux* | k*bsd*-gnu | kopensolaris*-gnu) 5024 5051 lt_cv_deplibs_check_method=pass_all 5025 5052 ;; … … 5761 5788 *-*-irix6*) 5762 5789 # Find out which ABI we are using. 5763 echo '#line 57 63"configure"' > conftest.$ac_ext5790 echo '#line 5790 "configure"' > conftest.$ac_ext 5764 5791 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 5765 5792 (eval $ac_compile) 2>&5 … … 7291 7318 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7292 7319 -e 's:$: $lt_compiler_flag:'` 7293 (eval echo "\"\$as_me:7 293: $lt_compile\"" >&5)7320 (eval echo "\"\$as_me:7320: $lt_compile\"" >&5) 7294 7321 (eval "$lt_compile" 2>conftest.err) 7295 7322 ac_status=$? 7296 7323 cat conftest.err >&5 7297 echo "$as_me:7 297: \$? = $ac_status" >&57324 echo "$as_me:7324: \$? = $ac_status" >&5 7298 7325 if (exit $ac_status) && test -s "$ac_outfile"; then 7299 7326 # The compiler can only warn and ignore the option if not recognized … … 7460 7487 ;; 7461 7488 7462 linux* | k*bsd*-gnu )7489 linux* | k*bsd*-gnu | kopensolaris*-gnu) 7463 7490 case $cc_basename in 7464 7491 # old Intel for x86_64 which still supported -KPIC. … … 7630 7657 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7631 7658 -e 's:$: $lt_compiler_flag:'` 7632 (eval echo "\"\$as_me:76 32: $lt_compile\"" >&5)7659 (eval echo "\"\$as_me:7659: $lt_compile\"" >&5) 7633 7660 (eval "$lt_compile" 2>conftest.err) 7634 7661 ac_status=$? 7635 7662 cat conftest.err >&5 7636 echo "$as_me:76 36: \$? = $ac_status" >&57663 echo "$as_me:7663: \$? = $ac_status" >&5 7637 7664 if (exit $ac_status) && test -s "$ac_outfile"; then 7638 7665 # The compiler can only warn and ignore the option if not recognized … … 7735 7762 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7736 7763 -e 's:$: $lt_compiler_flag:'` 7737 (eval echo "\"\$as_me:77 37: $lt_compile\"" >&5)7764 (eval echo "\"\$as_me:7764: $lt_compile\"" >&5) 7738 7765 (eval "$lt_compile" 2>out/conftest.err) 7739 7766 ac_status=$? 7740 7767 cat out/conftest.err >&5 7741 echo "$as_me:77 41: \$? = $ac_status" >&57768 echo "$as_me:7768: \$? = $ac_status" >&5 7742 7769 if (exit $ac_status) && test -s out/conftest2.$ac_objext 7743 7770 then … … 7790 7817 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7791 7818 -e 's:$: $lt_compiler_flag:'` 7792 (eval echo "\"\$as_me:7 792: $lt_compile\"" >&5)7819 (eval echo "\"\$as_me:7819: $lt_compile\"" >&5) 7793 7820 (eval "$lt_compile" 2>out/conftest.err) 7794 7821 ac_status=$? 7795 7822 cat out/conftest.err >&5 7796 echo "$as_me:7 796: \$? = $ac_status" >&57823 echo "$as_me:7823: \$? = $ac_status" >&5 7797 7824 if (exit $ac_status) && test -s out/conftest2.$ac_objext 7798 7825 then … … 7933 7960 supports_anon_versioning=no 7934 7961 case `$LD -v 2>&1` in 7962 *GNU\ gold*) supports_anon_versioning=yes ;; 7935 7963 *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 7936 7964 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... … … 8024 8052 ;; 8025 8053 8026 gnu* | linux* | tpf* | k*bsd*-gnu )8054 gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) 8027 8055 tmp_diet=no 8028 8056 if test "$host_os" = linux-dietlibc; then … … 9486 9514 9487 9515 # This must be Linux ELF. 9488 linux* | k*bsd*-gnu )9516 linux* | k*bsd*-gnu | kopensolaris*-gnu) 9489 9517 version_type=linux 9490 9518 need_lib_prefix=no … … 10173 10201 lt_status=$lt_dlunknown 10174 10202 cat > conftest.$ac_ext <<_LT_EOF 10175 #line 10 175"configure"10203 #line 10203 "configure" 10176 10204 #include "confdefs.h" 10177 10205 … … 10269 10297 lt_status=$lt_dlunknown 10270 10298 cat > conftest.$ac_ext <<_LT_EOF 10271 #line 102 71"configure"10299 #line 10299 "configure" 10272 10300 #include "confdefs.h" 10273 10301 … … 11888 11916 # values after options handling. 11889 11917 ac_log=" 11890 This file was extended by mod_gnutls $as_me 0.5. 7, which was11891 generated by GNU Autoconf 2.6 4. Invocation command line was11918 This file was extended by mod_gnutls $as_me 0.5.8, which was 11919 generated by GNU Autoconf 2.65. Invocation command line was 11892 11920 11893 11921 CONFIG_FILES = $CONFIG_FILES … … 11929 11957 -h, --help print this help, then exit 11930 11958 -V, --version print version number and configuration settings, then exit 11959 --config print configuration, then exit 11931 11960 -q, --quiet, --silent 11932 11961 do not print progress messages … … 11951 11980 _ACEOF 11952 11981 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 11982 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 11953 11983 ac_cs_version="\\ 11954 mod_gnutls config.status 0.5. 711955 configured by $0, generated by GNU Autoconf 2.6 4,11956 with options \\" `$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"11984 mod_gnutls config.status 0.5.8 11985 configured by $0, generated by GNU Autoconf 2.65, 11986 with options \\"\$ac_cs_config\\" 11957 11987 11958 11988 Copyright (C) 2009 Free Software Foundation, Inc. … … 11992 12022 --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) 11993 12023 $as_echo "$ac_cs_version"; exit ;; 12024 --config | --confi | --conf | --con | --co | --c ) 12025 $as_echo "$ac_cs_config"; exit ;; 11994 12026 --debug | --debu | --deb | --de | --d | -d ) 11995 12027 debug=: ;; … … 12437 12469 :nl 12438 12470 h 12439 s/\(.\{148\}\). */\1/12471 s/\(.\{148\}\)..*/\1/ 12440 12472 t more1 12441 12473 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ … … 12451 12483 :delim 12452 12484 h 12453 s/\(.\{148\}\). */\1/12485 s/\(.\{148\}\)..*/\1/ 12454 12486 t more2 12455 12487 s/["\\]/\\&/g; s/^/"/; s/$/"/ -
configure.ac
rae015fa r9c4a7444 1 1 dnl 2 AC_INIT(mod_gnutls, 0.5. 7)2 AC_INIT(mod_gnutls, 0.5.8) 3 3 OOO_CONFIG_NICE(config.nice) 4 4 MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION -
m4/libtool.m4
rae015fa r9c4a7444 2446 2446 2447 2447 # This must be Linux ELF. 2448 linux* | k*bsd*-gnu )2448 linux* | k*bsd*-gnu | kopensolaris*-gnu) 2449 2449 version_type=linux 2450 2450 need_lib_prefix=no … … 3085 3085 3086 3086 # This must be Linux ELF. 3087 linux* | k*bsd*-gnu )3087 linux* | k*bsd*-gnu | kopensolaris*-gnu) 3088 3088 lt_cv_deplibs_check_method=pass_all 3089 3089 ;; … … 3706 3706 esac 3707 3707 ;; 3708 linux* | k*bsd*-gnu )3708 linux* | k*bsd*-gnu | kopensolaris*-gnu) 3709 3709 case $cc_basename in 3710 3710 KCC*) … … 3990 3990 ;; 3991 3991 3992 linux* | k*bsd*-gnu )3992 linux* | k*bsd*-gnu | kopensolaris*-gnu) 3993 3993 case $cc_basename in 3994 3994 # old Intel for x86_64 which still supported -KPIC. … … 4286 4286 supports_anon_versioning=no 4287 4287 case `$LD -v 2>&1` in 4288 *GNU\ gold*) supports_anon_versioning=yes ;; 4288 4289 *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 4289 4290 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... … … 4377 4378 ;; 4378 4379 4379 gnu* | linux* | tpf* | k*bsd*-gnu )4380 gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) 4380 4381 tmp_diet=no 4381 4382 if test "$host_os" = linux-dietlibc; then … … 5861 5862 ;; 5862 5863 5863 linux* | k*bsd*-gnu )5864 linux* | k*bsd*-gnu | kopensolaris*-gnu) 5864 5865 case $cc_basename in 5865 5866 KCC*) -
m4/ltversion.m4
rae015fa r9c4a7444 10 10 # Generated from ltversion.in. 11 11 12 # serial 301 2ltversion.m412 # serial 3017 ltversion.m4 13 13 # This file is part of GNU Libtool 14 14 15 m4_define([LT_PACKAGE_VERSION], [2.2.6 ])16 m4_define([LT_PACKAGE_REVISION], [1.301 2])15 m4_define([LT_PACKAGE_VERSION], [2.2.6b]) 16 m4_define([LT_PACKAGE_REVISION], [1.3017]) 17 17 18 18 AC_DEFUN([LTVERSION_VERSION], 19 [macro_version='2.2.6 '20 macro_revision='1.301 2'19 [macro_version='2.2.6b' 20 macro_revision='1.3017' 21 21 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) 22 22 _LT_DECL(, macro_revision, 0) -
src/Makefile.in
rae015fa r9c4a7444 1 # Makefile.in generated by automake 1.11 from Makefile.am.1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 2 2 # @configure_input@ 3 3 -
src/gnutls_config.c
rae015fa r9c4a7444 607 607 sc->cache_type = mgs_cache_none; 608 608 sc->cache_config = ap_server_root_relative(p, "conf/gnutls_cache"); 609 sc->tickets = 1; /* by default enable session tickets */ 609 610 610 611 sc->client_verify_mode = GNUTLS_CERT_IGNORE; -
src/gnutls_hooks.c
rae015fa r9c4a7444 487 487 const char *mgs_hook_http_scheme(const request_rec * r) 488 488 { 489 mgs_srvconf_rec *sc = 489 mgs_srvconf_rec *sc; 490 491 if (r == NULL) 492 return NULL; 493 494 sc = 490 495 (mgs_srvconf_rec *) ap_get_module_config(r->server->module_config, 491 496 &gnutls_module); … … 501 506 apr_port_t mgs_hook_default_port(const request_rec * r) 502 507 { 503 mgs_srvconf_rec *sc = 508 mgs_srvconf_rec *sc; 509 510 if (r == NULL) 511 return 0; 512 513 sc = 504 514 (mgs_srvconf_rec *) ap_get_module_config(r->server->module_config, 505 515 &gnutls_module); … … 580 590 #endif 581 591 592 if (session == NULL) 593 return NULL; 594 582 595 _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__); 583 596 ctxt = gnutls_transport_get_ptr(session); … … 694 707 { 695 708 mgs_handle_t *ctxt; 696 mgs_srvconf_rec *sc = 709 mgs_srvconf_rec *sc; 710 711 _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__); 712 713 if (c == NULL) 714 return DECLINED; 715 716 sc = 697 717 (mgs_srvconf_rec *) ap_get_module_config(c->base_server-> 698 718 module_config, 699 719 &gnutls_module); 700 720 701 _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__);702 721 if (!(sc && (sc->enabled == GNUTLS_ENABLED_TRUE))) { 703 722 return DECLINED; … … 733 752 int rv = OK; 734 753 754 if (r == NULL) 755 return DECLINED; 756 735 757 _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__); 736 758 apr_table_t *env = r->subprocess_env; … … 739 761 ap_get_module_config(r->connection->conn_config, &gnutls_module); 740 762 741 if (!ctxt ) {763 if (!ctxt || ctxt->session == NULL) { 742 764 return DECLINED; 743 765 } … … 805 827 int rv; 806 828 mgs_handle_t *ctxt; 807 mgs_dirconf_rec *dc = ap_get_module_config(r->per_dir_config, 829 mgs_dirconf_rec *dc; 830 831 if (r == NULL) 832 return DECLINED; 833 834 dc = ap_get_module_config(r->per_dir_config, 808 835 &gnutls_module); 809 836 … … 812 839 ap_get_module_config(r->connection->conn_config, &gnutls_module); 813 840 814 if (!ctxt ) {841 if (!ctxt || ctxt->session == NULL) { 815 842 return DECLINED; 816 843 } … … 875 902 size_t len; 876 903 int ret, i; 904 905 if (r == NULL) 906 return; 877 907 878 908 apr_table_t *env = r->subprocess_env; … … 984 1014 size_t len; 985 1015 int ret; 1016 1017 if (r == NULL) 1018 return; 986 1019 987 1020 _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__); … … 1044 1077 { 1045 1078 const gnutls_datum_t *cert_list; 1046 unsigned int cert_list_size, status , expired;1079 unsigned int cert_list_size, status; 1047 1080 int rv = GNUTLS_E_NO_CERTIFICATE_FOUND, ret; 1048 1081 unsigned int ch_size = 0; … … 1051 1084 gnutls_openpgp_crt_t pgp; 1052 1085 } cert; 1053 apr_time_t activation_time, expiration_time, cur_time; 1086 apr_time_t expiration_time, cur_time; 1087 1088 if (r == NULL || ctxt == NULL || ctxt->session == NULL) 1089 return HTTP_FORBIDDEN; 1054 1090 1055 1091 _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__); … … 1117 1153 apr_time_ansi_put(&expiration_time, 1118 1154 gnutls_x509_crt_get_expiration_time(cert.x509[0])); 1119 apr_time_ansi_put(&activation_time,1120 gnutls_x509_crt_get_activation_time(cert.x509[0]));1121 1155 1122 1156 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, … … 1128 1162 apr_time_ansi_put(&expiration_time, 1129 1163 gnutls_openpgp_crt_get_expiration_time(cert.pgp)); 1130 apr_time_ansi_put(&activation_time,1131 gnutls_openpgp_crt_get_creation_time(cert.pgp));1132 1164 1133 1165 rv = gnutls_openpgp_crt_verify_ring(cert.pgp, ctxt->sc->pgp_list, … … 1151 1183 /* ret = gnutls_x509_crt_check_revocation(crt, crl_list, crl_list_size); */ 1152 1184 1153 expired = 0;1154 1185 cur_time = apr_time_now(); 1155 if (activation_time > cur_time) {1156 ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,1157 "GnuTLS: Failed to Verify Peer: "1158 "Peer Certificate is not yet activated.");1159 expired = 1;1160 }1161 1162 if (gnutls_certificate_type_get( ctxt->session) != GNUTLS_CRT_OPENPGP || expiration_time != 0) {1163 if (expiration_time < cur_time) {1164 ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,1165 "GnuTLS: Failed to Verify Peer: "1166 "Peer Certificate is expired.");1167 expired = 1;1168 }1169 }1170 1186 1171 1187 if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) { … … 1177 1193 ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 1178 1194 "GnuTLS: Peer's Certificate signer is not a CA"); 1195 } 1196 1197 if (status & GNUTLS_CERT_INSECURE_ALGORITHM) { 1198 ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 1199 "GnuTLS: Peer's Certificate is using insecure algorithms"); 1200 } 1201 1202 if (status & GNUTLS_CERT_EXPIRED || status & GNUTLS_CERT_NOT_ACTIVATED) { 1203 ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 1204 "GnuTLS: Peer's Certificate signer is expired or not yet activated"); 1179 1205 } 1180 1206 … … 1203 1229 } 1204 1230 1205 if (status == 0 && expired == 0) {1231 if (status == 0) { 1206 1232 apr_table_setn(r->subprocess_env, "SSL_CLIENT_VERIFY", "SUCCESS"); 1207 1233 ret = OK; -
src/gnutls_io.c
rae015fa r9c4a7444 222 222 } 223 223 } 224 225 if (ctxt->session == NULL) { 226 return APR_EGENERAL; 227 } 224 228 225 229 while (1) { … … 361 365 int maxtries = HANDSHAKE_MAX_TRIES; 362 366 363 if (ctxt->status != 0 ) {367 if (ctxt->status != 0 || ctxt->session == NULL) { 364 368 return -1; 365 369 } … … 442 446 { 443 447 int rv; 448 449 if (ctxt->session == NULL) 450 return -1; 444 451 445 452 rv = gnutls_rehandshake(ctxt->session); … … 566 573 apr_bucket_copy(bucket, &e); 567 574 APR_BRIGADE_INSERT_TAIL(ctxt->output_bb, e); 568 575 569 576 if ((status = ap_pass_brigade(f->next, tmpb)) != APR_SUCCESS) { 570 577 apr_brigade_cleanup(ctxt->output_bb); … … 610 617 if (len > 0) { 611 618 612 do { 613 ret = gnutls_record_send(ctxt->session, data, len); 614 } 615 while(ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN); 619 if (ctxt->session == NULL) { 620 ret = GNUTLS_E_INVALID_REQUEST; 621 } else { 622 do { 623 ret = gnutls_record_send(ctxt->session, data, len); 624 } 625 while(ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN); 626 } 616 627 617 628 if (ret < 0) { … … 675 686 return 0; 676 687 } else { 677 gnutls_transport_set_errno(ctxt->session, EINTR); 688 if (ctxt->session) 689 gnutls_transport_set_errno(ctxt->session, EINTR); 678 690 return -1; 679 691 } … … 698 710 || APR_STATUS_IS_EINTR(ctxt->input_rc)) { 699 711 if (len == 0) { 700 gnutls_transport_set_errno(ctxt->session, EINTR); 712 if (ctxt->session) 713 gnutls_transport_set_errno(ctxt->session, EINTR); 701 714 return -1; 702 715 }
Note: See TracChangeset
for help on using the changeset viewer.