From b9008ecf559f93d1f86cf70b4f6d3e4b8b3d1e93 Mon Sep 17 00:00:00 2001 From: Karl Heyes Date: Tue, 18 Feb 2014 01:46:17 +0000 Subject: [PATCH] cut a kh10 release --- NEWS | 22 ++++++++++++++++++++++ configure | 44 ++++++++++++++++++++++---------------------- configure.in | 2 +- win32/icecast.nsis | 2 +- 4 files changed, 46 insertions(+), 24 deletions(-) diff --git a/NEWS b/NEWS index 36fd0fb9..74b98462 100644 --- a/NEWS +++ b/NEWS @@ -16,6 +16,28 @@ Feature differences from SVN trunk any extra tags are show in the conf/icecast.xml.dist file +2.3.3-kh10 +. xslt update race fix +. Format + mpeg parsing can be bypassed if mpeg4 is detected. + mpeg assumed by default even application/octet for streams only. + EBML streaming working again. + Ogg handler was getting stuck with large pages, typically intro via libcurl. +. Auth + Fix up intro content from auth. + Presume innocent setting was being ignore if the queue was full. + Added referer to auth command +. Relay updates. + uses single structure for all relays, with timestamps. makes better + handling of startup, shutdown and changes to relays. + A redirect response handled better, if user/pass returned. + Queue cleanup on inactive relay, reduce memory use in such cases. +. issue CORS headers, just wildcard for now. +. yp race fixed, make sure yp_currently_playing is not dependent on YP add completing +. stats client bug on initial stats dump fixed +. various internal setting tweaks to trigger events or limit actions. +. various lockup and crash cases fixed. + 2.3.3-kh9 . Allow for ${mount} to be specified in dump-file, on-[dis]connect, fallback-mount and intro. Useful in cases where a wildcard mount block is used but requires these options diff --git a/configure b/configure index 80857547..a1f6eada 100755 --- a/configure +++ b/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for Icecast 2.3.3-kh9. +# Generated by GNU Autoconf 2.68 for Icecast 2.3.3-kh10. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -246,11 +246,11 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and karl@xiph.org -$0: about your system, including any error possibly output -$0: before this message. Then install a modern shell, or -$0: manually run the script under such a shell if you do -$0: have one." + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: karl@xkheyes.plus.com about your system, including any +$0: error possibly output before this message. Then install +$0: a modern shell, or manually run the script under such a +$0: shell if you do have one." fi exit 1 fi @@ -570,9 +570,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Icecast' PACKAGE_TARNAME='icecast' -PACKAGE_VERSION='2.3.3-kh9' -PACKAGE_STRING='Icecast 2.3.3-kh9' -PACKAGE_BUGREPORT='karl@xiph.org' +PACKAGE_VERSION='2.3.3-kh10' +PACKAGE_STRING='Icecast 2.3.3-kh10' +PACKAGE_BUGREPORT='karl@xkheyes.plus.com' PACKAGE_URL='' # Factoring default headers for most tests. @@ -1356,7 +1356,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Icecast 2.3.3-kh9 to adapt to many kinds of systems. +\`configure' configures Icecast 2.3.3-kh10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1426,7 +1426,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Icecast 2.3.3-kh9:";; + short | recursive ) echo "Configuration of Icecast 2.3.3-kh10:";; esac cat <<\_ACEOF @@ -1486,7 +1486,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1549,7 +1549,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Icecast configure 2.3.3-kh9 +Icecast configure 2.3.3-kh10 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2015,9 +2015,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ---------------------------- ## -## Report this to karl@xiph.org ## -## ---------------------------- ##" +( $as_echo "## ------------------------------------ ## +## Report this to karl@xkheyes.plus.com ## +## ------------------------------------ ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2196,7 +2196,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Icecast $as_me 2.3.3-kh9, which was +It was created by Icecast $as_me 2.3.3-kh10, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -11399,7 +11399,7 @@ fi # Define the identity of the package. PACKAGE='icecast' - VERSION='2.3.3-kh9' + VERSION='2.3.3-kh10' cat >>confdefs.h <<_ACEOF @@ -19101,7 +19101,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Icecast $as_me 2.3.3-kh9, which was +This file was extended by Icecast $as_me 2.3.3-kh10, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19161,13 +19161,13 @@ $config_headers Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Icecast config.status 2.3.3-kh9 +Icecast config.status 2.3.3-kh10 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 0a0907ea..5ef84610 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT([Icecast], [2.3.3-kh9], [karl@xkheyes.plus.com]) +AC_INIT([Icecast], [2.3.3-kh10], [karl@xkheyes.plus.com]) LT_INIT AC_PREREQ(2.59) diff --git a/win32/icecast.nsis b/win32/icecast.nsis index b5089ffe..9bd1fe51 100644 --- a/win32/icecast.nsis +++ b/win32/icecast.nsis @@ -13,7 +13,7 @@ # installer containing your program. Name "Icecast KH" -OutFile "icecast-2.3.3-kh9_setup.exe" +OutFile "icecast-2.3.3-kh10_setup.exe" InstallDir "$ProgramFiles\Icecast KH" InstallDirRegKey HKLM SOFTWARE\Icecast "Install_Dir"