Commit Graph

1294 Commits

Author SHA1 Message Date
Tilghman Lesher
145e2a7359 Merged revisions 258776 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r258776 | tilghman | 2010-04-25 13:12:14 -0500 (Sun, 25 Apr 2010) | 13 lines
  
  Merged revisions 258775 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r258775 | tilghman | 2010-04-25 13:09:05 -0500 (Sun, 25 Apr 2010) | 6 lines
    
    When StopMonitor is called, ensure that it will not be restarted by a channel event.
    (closes issue #16590)
     Reported by: kkm
     Patches: 
           resmonitor-16590-trunk.239289.diff uploaded by kkm (license 888)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@258778 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-25 18:14:09 +00:00
Leif Madsen
f9d57ab5a5 Merged revisions 254446 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r254446 | lmadsen | 2010-03-25 10:21:26 -0500 (Thu, 25 Mar 2010) | 9 lines
  
  handle_speechset has 4 arguments.
  
  Update code to reflect that handle_speechset has 4 arguments.
  
  (closes issue #17093)
  Reported by: gpatri
  Patches: 
        res_agi.patch uploaded by gpatri (license 1014)
  Tested by: pabelanger, mmichelson
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@254448 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 15:22:09 +00:00
Jeff Peeler
42e2b70c64 Merged revisions 254277 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r254277 | jpeeler | 2010-03-24 12:15:05 -0500 (Wed, 24 Mar 2010) | 78 lines
  
  Merged revisions 254235 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r254235 | jpeeler | 2010-03-23 19:37:23 -0500 (Tue, 23 Mar 2010) | 72 lines
    
    Ensure that monitor recordings are written to the correct location (again)
    
    This is an extension to 248860. As such the dialplan test has been extended:
    
    ; non absolute path, not combined
    exten => 5040, 1, monitor(wav,tmp/jeff/monitor_test)
    exten => 5040, n, dial(sip/5001)
    ; absolute path, not combined
    exten => 5041, 1, monitor(wav,/tmp/jeff/monitor_test2)
    exten => 5041, n, dial(sip/5001)
    ; no path, not combined
    exten => 5042, 1, monitor(wav,monitor_test3)
    exten => 5042, n, dial(sip/5001)
    ; combined: changemonitor from non absolute to no path (leaves tmp/jeff)
    exten => 5043, 1, monitor(wav,tmp/jeff/monitor_test4,m)
    exten => 5043, n, changemonitor(monitor_test5)
    exten => 5043, n, dial(sip/5001)
    ; combined: changemonitor from no path to non absolute path
    exten => 5044, 1, monitor(wav,monitor_test6,m)
    exten => 5044, n, changemonitor(tmp/jeff/monitor_test7) ; this wasn't possible before
    exten => 5044, n, dial(sip/5001)
    ; non absolute path, combined
    exten => 5045, 1, monitor(wav,tmp/jeff/monitor_test8,m)
    exten => 5045, n, dial(sip/5001)
    ; absolute path, combined 
    exten => 5046, 1, monitor(wav,/tmp/jeff/monitor_test9,m)
    exten => 5046, n, dial(sip/5001)
    ; no path, combined
    exten => 5047, 1, monitor(wav,monitor_test10,m)
    exten => 5047, n, dial(sip/5001)
    ; combined: changemonitor from non absolute to absolute (leaves tmp/jeff)
    exten => 5048, 1, monitor(wav,tmp/jeff/monitor_test11,m)
    exten => 5048, n, changemonitor(/tmp/jeff/monitor_test12)
    exten => 5048, n, dial(sip/5001)
    ; combined: changemonitor from absolute to non absolute (leaves /tmp/jeff)
    exten => 5049, 1, monitor(wav,/tmp/jeff/monitor_test13,m)
    exten => 5049, n, changemonitor(tmp/jeff/monitor_test14)
    exten => 5049, n, dial(sip/5001)
    ; combined: changemonitor from no path to absolute
    exten => 5050, 1, monitor(wav,monitor_test15,m)
    exten => 5050, n, changemonitor(/tmp/jeff/monitor_test16)
    exten => 5050, n, dial(sip/5001)
    ; combined: changemonitor from absolute to no path (leaves /tmp/jeff)
    exten => 5051, 1, monitor(wav,/tmp/jeff/monitor_test17,m)
    exten => 5051, n, changemonitor(monitor_test18)
    exten => 5051, n, dial(sip/5001)
    ; not combined: changemonitor from non absolute to no path (leaves tmp/jeff)
    exten => 5052, 1, monitor(wav,tmp/jeff/monitor_test19)
    exten => 5052, n, changemonitor(monitor_test20)
    exten => 5052, n, dial(sip/5001)
    ; not combined: changemonitor from no path to non absolute
    exten => 5053, 1, monitor(wav,monitor_test21)
    exten => 5053, n, changemonitor(tmp/jeff/monitor_test22)
    exten => 5053, n, dial(sip/5001)
    ; not combined: changemonitor from non absolute to absolute (leaves tmp/jeff)
    exten => 5054, 1, monitor(wav,tmp/jeff/monitor_test23)
    exten => 5054, n, changemonitor(/tmp/jeff/monitor_test24)
    exten => 5054, n, dial(sip/5001)
    ; not combined: changemonitor from absolute to non absolute (leaves /tmp/jeff)
    exten => 5055, 1, monitor(wav,/tmp/jeff/monitor_test24)
    exten => 5055, n, changemonitor(tmp/jeff/monitor_test25)
    exten => 5055, n, dial(sip/5001)
    ; not combined: changemonitor from no path to absolute
    exten => 5056, 1, monitor(wav,monitor_test26)
    exten => 5056, n, changemonitor(/tmp/jeff/monitor_test27)
    exten => 5056, n, dial(sip/5001)
    ; not combined: changemonitor from absolute to no path (leaves /tmp/jeff)
    exten => 5057, 1, monitor(wav,/tmp/jeff/monitor_test28)
    exten => 5057, n, changemonitor(monitor_test29)
    exten => 5057, n, dial(sip/5001)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@254283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-24 17:18:14 +00:00
Jeff Peeler
e9358fd3d3 Merged revisions 250787 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r250787 | jpeeler | 2010-03-04 19:05:46 -0600 (Thu, 04 Mar 2010) | 16 lines
  
  Merged revisions 250786 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r250786 | jpeeler | 2010-03-04 19:02:58 -0600 (Thu, 04 Mar 2010) | 9 lines
    
    Fix not being able to specify a URL in MOH class directory.
    
    Don't attempt to chdir on a URL!
    
    (closes issue #16875)
    Reported by: raarts
    Patches: 
          moh-http.patch uploaded by raarts (license 937)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@250789 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-05 01:08:36 +00:00
Jeff Peeler
c0e5693e7c Merged revisions 248952 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r248952 | jpeeler | 2010-02-25 17:09:54 -0600 (Thu, 25 Feb 2010) | 24 lines
  
  Merged revisions 248860 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r248860 | jpeeler | 2010-02-25 15:22:06 -0600 (Thu, 25 Feb 2010) | 18 lines
    
    Ensure that monitor recordings are written to the correct location (again)
    
    This is an extension to 248757. As such the dialplan test has been extended:
    
    exten => 5040, 1, monitor(wav,tmp/jeff/monitor_test,b)
    exten => 5040, n, dial(sip/5001)
    exten => 5041, 1, monitor(wav,/tmp/jeff/monitor_test2,b)
    exten => 5041, n, dial(sip/5001)
    exten => 5042, 1, monitor(wav,monitor_test3,b)
    exten => 5042, n, dial(sip/5001)
    exten => 5043, 1, monitor(wav,tmp/jeff/monitor_test3,m)
    exten => 5043, n, changemonitor(monitor_test4)
    exten => 5043, n, dial(sip/5001)
    exten => 5044, 1, monitor(wav,monitor_test4,m)
    exten => 5044, n, changemonitor(tmp/jeff/monitor_test5) ; this looks to fail by design and emits a warning
    exten => 5044, n, dial(sip/5001)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@248954 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-02-25 23:11:59 +00:00
Jeff Peeler
52b06f1ad8 Merged revisions 248793 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r248793 | jpeeler | 2010-02-25 12:37:56 -0600 (Thu, 25 Feb 2010) | 22 lines
  
  Merged revisions 248757 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r248757 | jpeeler | 2010-02-25 12:06:54 -0600 (Thu, 25 Feb 2010) | 15 lines
    
    Ensure that monitor recordings are written to the correct location.
    
    Recordings should be placed in the monitor directory when a non-absolute path
    is used.
    
    Exact dialplan used for testing:
    exten => 5040, 1, monitor(wav,tmp/jeff/monitor_test,b)
    exten => 5040, n, dial(sip/5001)
    exten => 5041, 1, monitor(wav,/tmp/jeff/monitor_test2,b)
    exten => 5041, n, dial(sip/5001)
    exten => 5042, 1, monitor(wav,monitor_test3,b)
    exten => 5042, n, dial(sip/5001)
    
    ABE-2101
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@248796 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-02-25 18:52:08 +00:00
Tilghman Lesher
9cbb23ea48 Merged revisions 247841 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r247841 | tilghman | 2010-02-18 17:13:46 -0600 (Thu, 18 Feb 2010) | 7 lines
  
  Revert an errant part of a previous cleanup, to fix a memory corruption issue.
  
  (closes issue #16368)
   Reported by: thirionjwf
   Patches: 
         res_speech.c.patch uploaded by thirionjwf (license 955)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@247843 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-02-18 23:15:11 +00:00
Tilghman Lesher
3c5eaf9639 Merged revisions 242967,242971 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r242967 | tilghman | 2010-01-25 15:38:33 -0600 (Mon, 25 Jan 2010) | 9 lines
  
  Merged revisions 242966 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r242966 | tilghman | 2010-01-25 15:36:33 -0600 (Mon, 25 Jan 2010) | 2 lines
    
    Only rebuild parsers by an option in menuselect
  ........
................
  r242971 | tilghman | 2010-01-25 15:51:41 -0600 (Mon, 25 Jan 2010) | 9 lines
  
  Merged revisions 242969 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r242969 | tilghman | 2010-01-25 15:50:22 -0600 (Mon, 25 Jan 2010) | 2 lines
    
    Err, and use the new menuselect define, too.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@242973 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-25 21:53:37 +00:00
Tilghman Lesher
8269240bd5 Merged revisions 242857 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r242857 | tilghman | 2010-01-25 14:18:15 -0600 (Mon, 25 Jan 2010) | 9 lines
  
  Merged revisions 242852 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r242852 | tilghman | 2010-01-25 14:15:45 -0600 (Mon, 25 Jan 2010) | 2 lines
    
    Restore FreeBSD to able-to-compile-ish-mode
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@242887 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-25 20:24:19 +00:00
Tilghman Lesher
00d6128233 Merged revisions 242729 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r242729 | tilghman | 2010-01-24 23:45:00 -0600 (Sun, 24 Jan 2010) | 9 lines
  
  Merged revisions 242728 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r242728 | tilghman | 2010-01-24 23:42:22 -0600 (Sun, 24 Jan 2010) | 2 lines
    
    Buildbot pointed out an error (thanks, buildbot!)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@242731 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-25 05:46:46 +00:00
Tilghman Lesher
ccd425cde8 Merged revisions 242724 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r242724 | tilghman | 2010-01-24 23:34:33 -0600 (Sun, 24 Jan 2010) | 9 lines
  
  Merged revisions 242723 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r242723 | tilghman | 2010-01-24 23:33:37 -0600 (Sun, 24 Jan 2010) | 2 lines
    
    Oops, should have used CMD_PREFIX, not ECHO_PREFIX, for the commands.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@242726 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-25 05:35:27 +00:00
Tilghman Lesher
57ee6c8615 Merged revisions 242521 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r242521 | tilghman | 2010-01-24 00:40:31 -0600 (Sun, 24 Jan 2010) | 15 lines
  
  Merged revisions 242520 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r242520 | tilghman | 2010-01-24 00:33:01 -0600 (Sun, 24 Jan 2010) | 8 lines
    
    Only rebuild bison and flex source files on demand, if bison and flex are detected by the configure script.
    
    Changed after discussion on the -dev list about possible unnecessary build
    failures, due to checkouts/untars causing these special source files to
    possibly be newer than their resulting C files.  This should additionally
    ensure that nobody need learn about extra Makefile arguments to ensure the
    proper files get rebuilt when changes are made to these special source files.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@242523 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-24 06:42:32 +00:00
Tilghman Lesher
788ef08271 Merged revisions 242424 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r242424 | tilghman | 2010-01-22 15:45:18 -0600 (Fri, 22 Jan 2010) | 14 lines
  
  Merged revisions 242423 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r242423 | tilghman | 2010-01-22 15:44:18 -0600 (Fri, 22 Jan 2010) | 7 lines
    
    Rebuild from flex, bison sources when necessary.
    
    (issue #14629)
     Reported by: Marquis
     Patches: 
           20100121__issue14629.diff.txt uploaded by tilghman (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@242426 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-22 21:46:36 +00:00
Sean Bright
0758e620c9 Merged revisions 240667 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240667 | seanbright | 2010-01-15 19:54:08 -0500 (Fri, 15 Jan 2010) | 2 lines
  
  Get MoH building on OpenSolaris.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@240669 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-16 00:59:24 +00:00
Sean Bright
9a48f50452 Merged revisions 240271 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240271 | seanbright | 2010-01-14 18:13:02 -0500 (Thu, 14 Jan 2010) | 7 lines
  
  Plug a memory leak in res_config_ldap.
  
  (closes issue #16257)
  Reported by: nito
  Patches:
        issue16257_20100111.diff uploaded by seanbright (license 71)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@240279 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-14 23:18:34 +00:00
Sean Bright
b4a18d862b Merged revisions 239473 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r239473 | seanbright | 2010-01-12 12:09:12 -0500 (Tue, 12 Jan 2010) | 10 lines
  
  Fix crash in res_config_ldap.
  
  We need to allocate enough room for 2 pointers, not 2 characters.
  
  (closes issue #16397)
  Reported by: bklang
  Patches:
        res_config_ldap.patch uploaded by applsplatz (license 949)
  Tested by: applsplatz
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@239476 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-12 17:14:41 +00:00
Tilghman Lesher
3ad89edcaf Merged revisions 238754 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r238754 | tilghman | 2010-01-08 16:17:03 -0600 (Fri, 08 Jan 2010) | 7 lines
  
  Initialize variables that we attempt to free later.
  (closes issue #16302)
   Reported by: yahsyn
   Patches: 
         20091124__issue16302.diff.txt uploaded by tilghman (license 14)
   Tested by: yahsyn
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@238763 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-08 22:18:40 +00:00
Tilghman Lesher
b5e1442f4c Merged revisions 237406 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r237406 | tilghman | 2010-01-04 12:28:28 -0600 (Mon, 04 Jan 2010) | 23 lines
  
  Merged revisions 237405 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r237405 | tilghman | 2010-01-04 12:19:00 -0600 (Mon, 04 Jan 2010) | 16 lines
    
    Add a flag to disable the Background behavior, for AGI users.
    This is in a section of code that relates to two other issues, namely
    issue #14011 and issue #14940), one of which was the behavior of
    Background when called with a context argument that matched the current
    context.  This fix broke FreePBX, however, in a post-Dial situation.
    Needless to say, this is an extremely difficult collision of several
    different issues.  While the use of an exception flag is ugly, fixing all
    of the issues linked is rather difficult (although if someone would like
    to propose a better solution, we're happy to entertain that suggestion).
    (closes issue #16434)
     Reported by: rickead2000
     Patches: 
           20091217__issue16434.diff.txt uploaded by tilghman (license 14)
           20091222__issue16434__1.6.1.diff.txt uploaded by tilghman (license 14)
     Tested by: rickead2000
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@237408 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-04 18:30:44 +00:00
Jeff Peeler
69ba28b0ac Merged revisions 237323 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r237323 | jpeeler | 2010-01-04 10:24:51 -0600 (Mon, 04 Jan 2010) | 5 lines
  
  Fix timeout for AGI command speech recognize.
  
  (closes issue #16297)
  Reported by: semond
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@237325 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-04 16:26:49 +00:00
Tilghman Lesher
06e7edc525 Merged revisions 236186 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r236186 | tilghman | 2009-12-22 21:07:48 -0600 (Tue, 22 Dec 2009) | 11 lines
  
  Merged revisions 236184 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r236184 | tilghman | 2009-12-22 20:55:24 -0600 (Tue, 22 Dec 2009) | 4 lines
    
    If EXEC only gets a single argument, don't crash when the second is used.
    (closes issue #16504)
     Reported by: bklang
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@236188 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-12-23 03:10:21 +00:00
Jeff Peeler
af9f677f0d Merged revisions 235941 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r235941 | jpeeler | 2009-12-21 13:54:20 -0600 (Mon, 21 Dec 2009) | 20 lines
  
  Merged revisions 235940 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r235940 | jpeeler | 2009-12-21 13:43:41 -0600 (Mon, 21 Dec 2009) | 13 lines
    
    Change Monitor to not assume file to write to does not contain pathing.
    
    227944 changed the fname_base argument to always append the configured monitor
    path. This change was necessary to properly compare files for uniqueness. 
    If a full path is given though, nothing needs to be appended and that is
    handled correctly now.
    
    (closes issue #16377)
    (closes issue #16376)
    Reported by: bcnit
    Patches:
          res_monitor.c-issue16376-1.patch uploaded by dant (license 670)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@235943 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-12-21 19:55:25 +00:00
Tilghman Lesher
0db37acd31 Merged revisions 235053 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r235053 | tilghman | 2009-12-15 09:33:49 -0600 (Tue, 15 Dec 2009) | 11 lines
  
  Merged revisions 235052 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r235052 | tilghman | 2009-12-15 09:29:24 -0600 (Tue, 15 Dec 2009) | 4 lines
    
    Mandatory argument checking
    (closes issue #16446)
     Reported by: nicchap
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@235055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-12-15 15:35:41 +00:00
Tilghman Lesher
cebb241a44 Merged revisions 234210 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r234210 | tilghman | 2009-12-10 12:56:23 -0600 (Thu, 10 Dec 2009) | 2 lines
  
  Missed a case that emits a WARNING where none is warranted.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@234212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-12-10 18:57:59 +00:00
Tilghman Lesher
cb67729153 Merged revisions 233718 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r233718 | tilghman | 2009-12-08 12:22:44 -0600 (Tue, 08 Dec 2009) | 8 lines
  
  Find another ref leak and change how we manage module references.
  (closes issue #16388)
   Reported by: parisioa
   Patches: 
         20091208__issue16388.diff.txt uploaded by tilghman (license 14)
   Tested by: parisioa, tilghman
   Review: https://reviewboard.asterisk.org/r/442/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@233730 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-12-08 18:31:03 +00:00
Tilghman Lesher
aa73b84593 Recorded merge of revisions 232660-232661 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r232660 | tilghman | 2009-12-02 18:08:55 -0600 (Wed, 02 Dec 2009) | 19 lines
  
  Fix multiple issues with musiconhold, which led to classes not getting destroyed properly.
   * Classes are now tracked past removal from the core container, and module
     removal is actively prevented until all references are freed.
   * A hanging reference stored in the channel has been removed.  This could have
     caused a mismatch and the music state not properly cleared, if two or more
     reloads occurred between MOH being stopped and MOH being restarted.
   * In certain circumstances, duplicate classes were possible.
   * A race existed at reload time between a process being killed and the thread
     responsible for reading from the related pipe respawning that process.
   * Several reference counts have also been corrected.  At least one could have
     caused deleted classes to stick around forever, consuming resources.  This
     originally manifested as MOH external processes that were not killed at
     reload time.
  (closes issue #16279, closes issue #16207)
   Reported by: parisioa, dcabot
   Patches: 
         20091202__issue16279__2.diff.txt uploaded by tilghman (license 14)
   Tested by: parisioa, tilghman
........
  r232661 | tilghman | 2009-12-02 18:09:36 -0600 (Wed, 02 Dec 2009) | 2 lines
  
  Remove debugging line
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@232666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-12-03 00:18:02 +00:00
David Vossel
c148e61d86 reverting changes made by r229095 as they are not applicable to 1.6.1
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@229098 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-11-10 15:36:10 +00:00
David Vossel
369b4646b4 Merged revisions 229093 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r229093 | dvossel | 2009-11-10 09:27:45 -0600 (Tue, 10 Nov 2009) | 11 lines
  
  fixes pgsql double free of threadstorage
  
  A thread storage variable was being freed incorrectly, which
  resulted in a double free if two queries were made in the same thread.
  
  (closes issue #16011)
  Reported by: cristiandimache
  Patches:
        issue16011.diff uploaded by dvossel (license 671)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@229095 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-11-10 15:28:57 +00:00
Jeff Peeler
95d01d01db Merged revisions 227945 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r227945 | jpeeler | 2009-11-04 17:50:59 -0600 (Wed, 04 Nov 2009) | 21 lines
  
  Merged revisions 227944 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r227944 | jpeeler | 2009-11-04 17:47:08 -0600 (Wed, 04 Nov 2009) | 14 lines
    
    Fix incorrect filename comparsion after monitor file change
    
    The logic to detect if a requested file is indeed a different file from the
    current file was incorrect. The main issue being confusion of the use of
    filename_base which was previously set without pathing information and then
    compared to another full path. Robust file comparison logic has been added
    to properly check if two files are the same even if symlinks are used.
    
    (closes issue #15313)
    Reported by: caspy
    Patches: 
          20091103__issue15313__1.4.diff.txt uploaded by jpeeler (license 325)
          but mostly tilghman's work
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@227948 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-11-04 23:56:19 +00:00
Terry Wilson
606c8a29aa Merged revisions 226099 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r226099 | twilson | 2009-10-27 11:48:54 -0500 (Tue, 27 Oct 2009) | 2 lines
  
  Don't prepend the URI prefix to the post directory
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@226100 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-27 17:04:41 +00:00
Tilghman Lesher
ab99a3d648 Recorded merge of revisions 222309 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r222309 | tilghman | 2009-10-06 14:31:39 -0500 (Tue, 06 Oct 2009) | 10 lines
  
  Change schema query to involve the use of an optional schema parameter.
  This change is done in such a way as to allow the driver to continue to
  function with older databases which don't have these features.
  (closes issue #16000)
   Reported by: jamicque
   Patches: 
         20091002__issue16000.diff.txt uploaded by tilghman (license 14)
         20091002__issue16000__1.6.1.diff.txt uploaded by tilghman (license 14)
   Tested by: jamicque
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@222310 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-06 19:34:48 +00:00
Tilghman Lesher
8c256183ce Merged revisions 222273 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r222273 | tilghman | 2009-10-06 14:17:11 -0500 (Tue, 06 Oct 2009) | 5 lines
  
  When we call a gosub routine, the variables should be scoped to avoid contaminating the caller.
  This affected the ~~EXTEN~~ hack, where a subroutine might have changed the
  value before it was used in the caller.
  Patch by myself, tested by ebroad on #asterisk
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@222282 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-06 19:20:22 +00:00
Kevin P. Fleming
0d04372afa Merged revisions 222176 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r222176 | kpfleming | 2009-10-05 20:24:24 -0500 (Mon, 05 Oct 2009) | 27 lines
  
  Recorded merge of revisions 222152 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r222152 | kpfleming | 2009-10-05 20:16:36 -0500 (Mon, 05 Oct 2009) | 20 lines
    
    Fix ao2_iterator API to hold references to containers being iterated.
    
    See Mantis issue for details of what prompted this change.
    
    Additional notes:
    
    This patch changes the ao2_iterator API in two ways: F_AO2I_DONTLOCK
    has become an enum instead of a macro, with a name that fits our
    naming policy; also, it is now necessary to call
    ao2_iterator_destroy() on any iterator that has been
    created. Currently this only releases the reference to the container
    being iterated, but in the future this could also release other
    resources used by the iterator, if the iterator implementation changes
    to use additional resources.
    
    (closes issue #15987)
    Reported by: kpfleming
    
    Review: https://reviewboard.asterisk.org/r/383/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@222186 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-06 01:36:36 +00:00
Matthias Nick
43ba36ed2e Merged revisions 217730 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r217730 | mnick | 2009-09-10 14:39:41 -0500 (Thu, 10 Sep 2009) | 17 lines
  
  
  Sets the correct musicclass after an announcement
  
  (closes issue #15279)
  Reported by: mbeckwell
  Patches:
        patch.txt uploaded by mnick (license )
  Tested by: mnick
  
  (closes issue #15832)
  Reported by: mbeckwell
  Patches:
        patch.txt uploaded by mnick (license 874)
  Tested by: mnick
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@217738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-10 19:55:54 +00:00
Tilghman Lesher
c0c763be9b Merged revisions 217638 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r217638 | tilghman | 2009-09-10 13:17:14 -0500 (Thu, 10 Sep 2009) | 4 lines
  
  Verify support for wide ODBC character types before using them.
  (closes issue #15870)
   Reported by: nic_bellamy
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@217642 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-10 18:18:39 +00:00
Tzafrir Cohen
7cce857d3c gcc 4.4 fix: union instead of cast
gcc 4.4 has more strict rules for aliasing. It doesn't like a 
struct sockaddr_in pointer pointing to a struct sockaddr. So we make it
a union.

Merged revisions 217445 via svnmerge from 
http://svn.digium.com/svn/asterisk/trunk


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@217518 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-09 20:30:29 +00:00
Tilghman Lesher
91954c4ba4 Merged revisions 217033 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r217033 | tilghman | 2009-09-08 10:30:18 -0500 (Tue, 08 Sep 2009) | 4 lines
  
  Remove what appears to be an unnecessary define.
  (closes issue #15851)
   Reported by: tzafrir
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@217035 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-08 15:36:01 +00:00
Gavin Henry
82bb507be9 Merged revisions 211767 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r211767 | ghenry | 2009-08-12 17:00:46 +0100 (Wed, 12 Aug 2009) | 33 lines
  
  Added three new attributes and applied a patch to res_config_ldap.c
  
  attributetype ( AstAccountSubscribeContext
          NAME 'AstAccountSubscribeContext'
          DESC 'Asterisk subscribe context'
          EQUALITY caseIgnoreMatch
          SUBSTR caseIgnoreSubstringsMatch
          SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
  
  attributetype ( AstAccountIpAddr
          NAME 'AstAccountIpAddr'
          DESC 'Asterisk aaccount IP address'
          EQUALITY caseIgnoreMatch
          SUBSTR caseIgnoreSubstringsMatch
          SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
  
  attributetype ( AstAccountUserAgent
          NAME 'AstAccountUserAgent'
          DESC 'Asterisk account user context'
          EQUALITY caseIgnoreMatch
          SUBSTR caseIgnoreSubstringsMatch
          SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
  
  and patch fix_empty_attributes_1.6.1.4_v2.patch 
  
  (closes issue #13725)
  Reported by: macogeek
  Patches:
        fix_empty_attributes_1.6.1.4_v2.patch uploaded by xvisor (license 863)
  Tested by: suretec
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@211775 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-08-12 16:19:00 +00:00
Tilghman Lesher
07e59f290c AST-2009-005
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@211569 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-08-10 19:30:55 +00:00
David Brooks
029963b5c5 Merged revisions 209098 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r209098 | dbrooks | 2009-07-27 11:33:50 -0500 (Mon, 27 Jul 2009) | 6 lines
  
  Fixing typos. Replaces "recieved" with "received" and "initilize" with "initialize"
  
  (closes issue #15571)
  Reported by: alecdavis
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@209233 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-07-27 20:28:28 +00:00
Mark Michelson
5d701b6c79 Merged revisions 209197 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r209197 | mmichelson | 2009-07-27 15:11:42 -0500 (Mon, 27 Jul 2009) | 9 lines
  
  Honor channel's music class when using realtime music on hold.
  
  (closes issue #15051)
  Reported by: alexh
  Patches:
        15051.patch uploaded by mmichelson (license 60)
  Tested by: alexh
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@209199 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-07-27 20:17:06 +00:00
David Brooks
415d2a3153 Just replacing typos "recieved" with "received".
(closes issue #15360)
Reported by: okrief



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@208459 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-07-23 20:45:41 +00:00
Kevin P. Fleming
cffe0f2476 Merged revisions 207680 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r207680 | kpfleming | 2009-07-21 08:28:04 -0500 (Tue, 21 Jul 2009) | 18 lines
  
  Merged revisions 207647 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r207647 | kpfleming | 2009-07-21 08:04:44 -0500 (Tue, 21 Jul 2009) | 12 lines
    
    Ensure that user-provided CFLAGS and LDFLAGS are honored.
    
    This commit changes the build system so that user-provided flags (in ASTCFLAGS
    and ASTLDFLAGS) are supplied to the compiler/linker *after* all flags provided
    by the build system itself, so that the user can effectively override the
    build system's flags if desired. In addition, ASTCFLAGS and ASTLDFLAGS can now
    be provided *either* in the environment before running 'make', or as variable
    assignments on the 'make' command line. As a result, the use of COPTS and LDOPTS
    is no longer necessary, so they are no longer documented, but are still supported
    so as not to break existing build systems that supply them when building Asterisk.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@207684 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-07-21 13:48:38 +00:00
Russell Bryant
24467ba927 Merged revisions 205120 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r205120 | russell | 2009-07-08 10:17:19 -0500 (Wed, 08 Jul 2009) | 16 lines
  
  Move OpenSSL initialization to a single place, make library usage thread-safe.
  
  While doing some reading about OpenSSL, I noticed a couple of things that
  needed to be improved with our usage of OpenSSL.
  
  1) We had initialization of the library done in multiple modules.  This has now
     been moved to a core function that gets executed during Asterisk startup.
     We already link OpenSSL into the core for TCP/TLS functionality, so this
     was the most logical place to do it.
  
  2) OpenSSL is not thread-safe by default.  However, making it thread safe is
     very easy.  We just have to provide a couple of callbacks.  One callback
     returns a thread ID.  The other handles locking.  For more information,
     start with the "Is OpenSSL thread-safe?" question on the FAQ page of
     openssl.org.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@205147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-07-08 15:29:10 +00:00
Tilghman Lesher
0d6dbd3774 Merged revisions 201904 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r201904 | tilghman | 2009-06-19 10:47:55 -0500 (Fri, 19 Jun 2009) | 4 lines
  
  Fix 2 typos and add support for wide character types.
  Reported by Benny Amorsen via the asterisk-users mailing list.
  http://lists.digium.com/pipermail/asterisk-users/2009-June/233622.html
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@201905 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-19 15:48:37 +00:00
David Vossel
09b65fe917 Merged revisions 201678 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r201678 | dvossel | 2009-06-18 11:37:42 -0500 (Thu, 18 Jun 2009) | 11 lines
  
  fixes some memory leaks and redundant conditions
  
  (closes issue #15269)
  Reported by: contactmayankjain
  Patches:
        patch.txt uploaded by contactmayankjain (license 740)
        memory_leak_stuff.trunk.diff uploaded by dvossel (license 671)
  Tested by: contactmayankjain, dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@201680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-18 16:51:54 +00:00
Russell Bryant
c6c5ca6454 Merged revisions 201610 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r201610 | russell | 2009-06-18 10:27:10 -0500 (Thu, 18 Jun 2009) | 36 lines
  
  Merged revisions 201600 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r201600 | russell | 2009-06-18 10:24:31 -0500 (Thu, 18 Jun 2009) | 29 lines
    
    Fix memory corruption and leakage related reloads of non files mode MoH classes.
    
    For Music on Hold classes that are not files mode, meaning that we are executing
    an application that will feed us audio data, we use a thread to monitor the
    external application and read audio from it.  This thread also makes use of the
    MoH class object.  In the MoH class destructor, we used pthread_cancel() to ask
    the thread to exit.  Unfortunately, the code did not wait to ensure that the
    thread actually went away.  What needed to be done is a pthread_join() to ensure
    that the thread fully cleans up before we proceed.  By adding this one line, we
    resolve two significant problems:
    
      1) Since the thread was never joined, it never fully goes away.  So, on every
         reload of non-files mode MoH, an unused thread was sticking around.
    
      2) There was a race condition here where the application monitoring thread
         could still try to access the MoH class, even though the thread executing
         the MoH reload has already destroyed it.
    
    (issue #15109)
    Reported by: jvandal
    
    (issue #15123)
    Reported by: axisinternet
    
    (issue #15195)
    Reported by: amorsen
    
    (issue AST-208)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@201613 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-18 15:36:11 +00:00
David Vossel
8e2f88caf5 Merged revisions 199743 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r199743 | dvossel | 2009-06-09 11:22:04 -0500 (Tue, 09 Jun 2009) | 11 lines
  
  module load priority
  
  This patch adds the option to give a module a load priority. The value represents the order in which a module's load() function is initialized.  The lower the value, the higher the priority.  The value is only checked if the AST_MODFLAG_LOAD_ORDER flag is set.  If the AST_MODFLAG_LOAD_ORDER flag is not set, the value will never be read and the module will be given the lowest possible priority
  on load.  Since some modules are reliant on a timing interface, the timing modules have been given a high load priorty.
  
  (closes issue #15191)
  Reported by: alecdavis
  Tested by: dvossel
  
  Review: https://reviewboard.asterisk.org/r/262/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@199745 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-09 16:33:31 +00:00
Eliel C. Sardanons
166dca480e Merged revisions 198437 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r198437 | eliel | 2009-05-30 21:22:15 -0400 (Sat, 30 May 2009) | 11 lines
  
  Avoid a crash when res_timing_dahdi is unloaded but wasn't properly loaded.
  
  if dahdi_test_timer() fails, timing_funcs_handle remains NULL causing a crash
  when calling ast_unregister_timing_interface() with a NULL pointer.
  
  (closes issue #15234)
  Reported by: eliel
  Patches:
        timing_dahdi1.diff uploaded by eliel (license 64)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@198441 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-31 01:58:53 +00:00
Sean Bright
676eaf42dc Merged revisions 198375 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r198375 | seanbright | 2009-05-30 16:11:33 -0400 (Sat, 30 May 2009) | 13 lines
  
  Properly terminate the receive buffer before sending to iksemel.
  
  aji_io_recv takes the maximum number of bytes to read (instead of the total
  buffer size), so we have to subtract 1 from our buffer size.  Without this, when
  we receive packets that are larger than our buffer, iksemel will choke and
  things get wonky.
  
  (closes issue #15232)
  Reported by: lp0
  Patches:
        05302009_res_jabber.c.patch uploaded by seanbright (license 71)
  Tested by: seanbright, lp0
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@198390 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-30 20:21:03 +00:00
Sean Bright
3e8686a005 Merged revisions 198371 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r198371 | seanbright | 2009-05-30 15:38:58 -0400 (Sat, 30 May 2009) | 19 lines
  
  Merged revisions 198370 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r198370 | seanbright | 2009-05-30 15:36:20 -0400 (Sat, 30 May 2009) | 12 lines
    
    Properly terminate AMI JabberSend response messages.
    
    The response message (either Error or Success) needs an extra trailing \r\n
    after the fields to inform the client that the message is complete.
    
    (closes issue #14876)
    Reported by: srt
    Patches:
          05302009_1.4_res_jabber.c.diff uploaded by seanbright (license 71)
          asterisk_14876.patch uploaded by srt (license 378)
          trunk-14876-2.diff uploaded by phsultan (license 73)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@198373 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-30 19:40:59 +00:00