[asterisk-commits] seanbright: branch group/1.6.1-maintenance r263459 - in /team/group/1.6.1-mai...

[SVN commits to the Asterisk project]

Author: seanbright
Date: Mon May 17 09:58:38 2010
New Revision: 263459

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=263459
Log:
Merged revisions 263375,263457 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r263375 | lmadsen | 2010-05-17 10:05:33 -0400 (Mon, 17 May 2010) | 16 lines
  
  Merged revisions 263374 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r263374 | lmadsen | 2010-05-17 09:04:57 -0500 (Mon, 17 May 2010) | 8 lines
    
    Update link to new version of core sounds.
    
    The latest version of the core sounds files 1.4.19 now includes the missing
    queue-minute sound file which is called by app_queue but which has been
    missing.
    
    (closes issue #17123)
    Reported by: n8ideas
  ........
................
  r263457 | lmadsen | 2010-05-17 10:37:35 -0400 (Mon, 17 May 2010) | 19 lines
  
  Recorded merge of revisions 263456 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r263456 | lmadsen | 2010-05-17 09:35:18 -0500 (Mon, 17 May 2010) | 11 lines
    
    Manager cookies are not compatible with RFC2109.
    
    The Version field in the cookies we're setting contain quotes around the version
    number which is not compatible with RFC2109 and breaks some implementations.
    
    (closes issue #17231)
    Reported by: ecarruda
    Patches:
          manager_rfc2109-trunk-v1.patch uploaded by ecarruda (license 559)
          manager_rfc2109-1.6.2-v1.patch uploaded by ecarruda (license 559)
    Tested by: ecarruda, russell
  ........
................

Modified:
    team/group/1.6.1-maintenance/   (props changed)
    team/group/1.6.1-maintenance/main/manager.c
    team/group/1.6.1-maintenance/sounds/Makefile

Propchange: team/group/1.6.1-maintenance/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: team/group/1.6.1-maintenance/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/group/1.6.1-maintenance/main/manager.c?view=diff&rev=263459&r1=263458&r2=263459
==============================================================================
--- team/group/1.6.1-maintenance/main/manager.c (original)
+++ team/group/1.6.1-maintenance/main/manager.c Mon May 17 09:58:38 2010
@@ -3889,7 +3889,7 @@
 	ast_str_append(&out, 0,
 		       "Content-type: text/%s\r\n"
 		       "Cache-Control: no-cache;\r\n"
-		       "Set-Cookie: mansession_id=\"%08x\"; Version=\"1\"; Max-Age=%d\r\n"
+		       "Set-Cookie: mansession_id=\"%08x\"; Version=1; Max-Age=%d\r\n"
 		       "\r\n",
 			contenttype[format],
 			session->managerid, httptimeout);

Modified: team/group/1.6.1-maintenance/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/group/1.6.1-maintenance/sounds/Makefile?view=diff&rev=263459&r1=263458&r2=263459
==============================================================================
--- team/group/1.6.1-maintenance/sounds/Makefile (original)
+++ team/group/1.6.1-maintenance/sounds/Makefile Mon May 17 09:58:38 2010
@@ -17,7 +17,7 @@
 
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
 MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
-CORE_SOUNDS_VERSION:=1.4.18
+CORE_SOUNDS_VERSION:=1.4.19
 EXTRA_SOUNDS_VERSION:=1.4.11
 MOH_VERSION:=2.03
 SOUNDS_URL:=http://downloads.asterisk.org/pub/telephony/sounds/releases