From ce8ec3bc781ec2ee382fed62885db5bc6a157b2b Mon Sep 17 00:00:00 2001 From: oddsock Date: Wed, 30 Nov 2005 17:40:40 +0000 Subject: [PATCH] version bumps for 2.3.1 svn path=/icecast/trunk/icecast/; revision=10503 --- ChangeLog | 136 +++++++++++++++++++++++++++++++++++++ configure.in | 2 +- icecast.spec | 2 +- win32/icecast.dsp | 4 +- win32/icecast2.iss | 4 +- win32/icecast2_console.dsp | 4 +- win32/icecastService.dsp | 4 +- 7 files changed, 146 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b84d4f0..acd3ec1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,139 @@ +2005-11-29 03:06 karl + + * trunk/icecast/src/auth_url.c: update for authentication header + via libcurl. allows for http://user:pass@host.. else the param + specified user/pass. In the case of listener_add/remove use the + client provided user/pass if no others are specified. + +2005-11-20 13:53 karl + + * trunk/icecast/src/source.c: allow for the intro file to change + over HUP + +2005-11-17 00:54 karl + + * trunk/icecast/src/auth.c, trunk/icecast/src/client.c, + trunk/icecast/src/client.h, trunk/icecast/src/connection.c: + change status code for server/stream full cases (#738), also + some others places where connections are terminated. + +2005-11-15 00:36 karl + + * trunk/icecast/src/stats.c: update queue handling for stats. This + was slow when many stats were being queued. These apply to both + web interface requests and stats clients. + +2005-11-15 00:29 karl + + * trunk/icecast/src/format_vorbis.c: fixup granulepos on EOS case + when rebuilding vorbis streams. This was causing a short audio + glitch on playback, but was not typically noticed. + +2005-10-24 14:51 oddsock + + * trunk/icecast/conf/icecast.xml.in, + trunk/icecast/doc/icecast2_config_file.html, + trunk/icecast/src/cfgfile.c, trunk/icecast/src/cfgfile.h, + trunk/icecast/src/logging.c, trunk/icecast/src/main.c: 2 new + features to icecast logging: - logsize : specify in KB the max + size of any of icecast log files - logarchive : causes icecast + to rename logs with timestamps (for proper archiving) + +2005-10-11 13:40 karl + + * trunk/icecast/src/cfgfile.c: avoid adding a mount_t structure if + there is no mount name defined, segv occurs later on + +2005-10-06 02:41 karl + + * trunk/icecast/src/client.c: fix bug #717. a race on source exit + could cause memory corruption + +2005-10-01 15:59 msmith + + * trunk/icecast/admin/manageauth.xsl: Don't display passwords in + auth management interface; it's useless and shouldn't be + displayed anyway. + +2005-10-01 14:08 karl + + * trunk/icecast/src/connection.c: add hack for nsvcap, apparently + EOL is 3 chars + +2005-09-30 16:30 pem + + * trunk/icecast/admin/fr_FR/listclients.xsl: Copying the /admin + xslt files into /admin/fr_FR for translation. + +2005-09-30 14:39 pem + + * trunk/icecast/admin/fr_FR, + trunk/icecast/admin/fr_FR/Makefile.am, + trunk/icecast/admin/fr_FR/listmounts.xsl, + trunk/icecast/admin/fr_FR/manageauth.xsl, + trunk/icecast/admin/fr_FR/moveclients.xsl, + trunk/icecast/admin/fr_FR/response.xsl, + trunk/icecast/admin/fr_FR/stats.xsl, + trunk/icecast/admin/fr_FR/updatemetadata.xsl: + +2005-09-29 15:07 msmith + + * trunk/icecast/doc/icecast2_basicsetup.html: One sentence in + intro to explain mountpoints + +2005-09-27 20:26 oddsock + + * trunk/icecast/admin/listclients.xsl, + trunk/icecast/admin/listmounts.xsl, + trunk/icecast/admin/stats.xsl, trunk/icecast/web/status.xsl: a + little better visibility for some features.. + +2005-09-27 02:47 oddsock + + * trunk/icecast/admin/listclients.xsl, + trunk/icecast/admin/listmounts.xsl: whoops..forgot these + +2005-09-27 02:45 oddsock + + * trunk/icecast/admin/stats.xsl, trunk/icecast/web/status.xsl: fix + auth.xsl link + +2005-09-26 16:34 karl + + * trunk/icecast/src/connection.c: Fix a bug where a shoutcast + source client (nsvtools) does not wait for the OK response. + Icecast was dropping the connection preventing the stream + +2005-09-23 21:31 oddsock + + * trunk/icecast/Makefile.am, trunk/icecast/configure.in, + trunk/icecast/examples/Makefile.am, + trunk/icecast/win32/icecast2.iss: include example application in + distribution + +2005-09-23 21:13 oddsock + + * trunk/icecast/Makefile.am: add examples to distribution + +2005-09-23 21:11 oddsock + + * trunk/icecast/examples, + trunk/icecast/examples/icecast_auth-1.0.tar.gz: forgot the + example listener auth application... + +2005-09-23 14:39 oddsock + + * trunk/icecast/ChangeLog: updated Changelog + +2005-09-23 14:23 oddsock + + * trunk/icecast/configure.in, trunk/icecast/icecast.spec, + trunk/icecast/win32/Makefile.am, + trunk/icecast/win32/icecast.dsp, + trunk/icecast/win32/icecast2.iss, + trunk/icecast/win32/icecast2_console.dsp: version bumps for 2.3 + forgot a few win32 files in the automake Makefile... + 2005-09-22 20:21 oddsock * trunk/icecast/NEWS: small addition diff --git a/configure.in b/configure.in index 991ddd6a..2dd6ccf9 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT([Icecast], [2.3.0], [icecast@xiph.org]) +AC_INIT([Icecast], [2.3.1], [icecast@xiph.org]) AC_PREREQ(2.54) AC_CONFIG_SRCDIR(src/main.c) diff --git a/icecast.spec b/icecast.spec index a9a1d391..ab96c9a1 100644 --- a/icecast.spec +++ b/icecast.spec @@ -1,5 +1,5 @@ Name: icecast -Version: 2.3.0 +Version: 2.3.1 Release: 0 Summary: Xiph Streaming media server that supports multiple audio formats. Group: Applications/Multimedia diff --git a/win32/icecast.dsp b/win32/icecast.dsp index 9f700f8e..b37f0efe 100644 --- a/win32/icecast.dsp +++ b/win32/icecast.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Releaseicecast" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../curl/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /I "../../speex/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.0\" /D "HAVE_LOCALTIME_R" /D "HAVE_OLD_VSNPRINTF" /D "HAVE_THEORA" /D "HAVE_SPEEX" /D "HAVE_AUTH_URL" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../curl/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /I "../../speex/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.1\" /D "HAVE_LOCALTIME_R" /D "HAVE_OLD_VSNPRINTF" /D "HAVE_THEORA" /D "HAVE_SPEEX" /D "HAVE_AUTH_URL" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debugicecast" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../curl/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /I "../../speex/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.0\" /D "HAVE_LOCALTIME_R" /D "HAVE_OLD_VSNPRINTF" /D "HAVE_THEORA" /D "HAVE_SPEEX" /D "HAVE_AUTH_URL" /FD /D /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../curl/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /I "../../speex/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.1\" /D "HAVE_LOCALTIME_R" /D "HAVE_OLD_VSNPRINTF" /D "HAVE_THEORA" /D "HAVE_SPEEX" /D "HAVE_AUTH_URL" /FD /D /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/win32/icecast2.iss b/win32/icecast2.iss index 39dabd6e..32349a53 100644 --- a/win32/icecast2.iss +++ b/win32/icecast2.iss @@ -3,7 +3,7 @@ [Setup] AppName=Icecast2 Win32 -AppVerName=Icecast v2.3.0 +AppVerName=Icecast v2.3.1 AppPublisherURL=http://www.icecast.org AppSupportURL=http://www.icecast.org AppUpdatesURL=http://www.icecast.org @@ -13,7 +13,7 @@ AllowNoIcons=yes LicenseFile=..\COPYING InfoAfterFile=..\README OutputDir=. -OutputBaseFilename=icecast2_win32_v2.3.0_setup +OutputBaseFilename=icecast2_win32_v2.3.1_setup WizardImageFile=icecast2logo2.bmp WizardImageStretch=no ; uncomment the following line if you want your installation to run on NT 3.51 too. diff --git a/win32/icecast2_console.dsp b/win32/icecast2_console.dsp index acc795fc..7123d1f0 100644 --- a/win32/icecast2_console.dsp +++ b/win32/icecast2_console.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.0\" /D "HAVE_THEORA" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.1\" /D "HAVE_THEORA" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.0\" /D "HAVE_THEORA" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.1\" /D "HAVE_THEORA" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/win32/icecastService.dsp b/win32/icecastService.dsp index 527db14e..a37becb0 100644 --- a/win32/icecastService.dsp +++ b/win32/icecastService.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_SERVICE" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.0\" /D "HAVE_THEORA" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_SERVICE" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.1\" /D "HAVE_THEORA" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_SERVICE" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.0\" /D "HAVE_THEORA" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../" /I "../../libxslt/include" /I "../../curl/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0.1/include" /I "../../theora/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_SERVICE" /D "HAVE_CURL" /D "USE_YP" /D "HAVE_SYS_STAT_H" /D PACKAGE_VERSION=\"2.3.1\" /D "HAVE_THEORA" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe