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

..

ael

Merged revisions 222273 via svnmerge from

2009-10-06 19:20:22 +00:00

ais

Merged revisions 184630 via svnmerge from

2009-03-27 14:04:56 +00:00

snmp

AST-2009-005

2009-08-10 19:30:55 +00:00

Makefile

Merged revisions 207680 via svnmerge from

2009-07-21 13:48:38 +00:00

res_adsi.c

All of the res/ stuff (other than res_jabber) from the RSW branch.

2008-08-10 00:47:56 +00:00

res_ael_share.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

res_agi.c

AST-2009-005

2009-08-10 19:30:55 +00:00

res_ais.c

Merged revisions 179164 via svnmerge from

2009-02-27 21:48:00 +00:00

res_clioriginate.c

Merged revisions 102378 via svnmerge from

2008-02-05 15:10:36 +00:00

res_config_curl.c

AST-2009-005

2009-08-10 19:30:55 +00:00

res_config_ldap.c

Merged revisions 211767 via svnmerge from

2009-08-12 16:19:00 +00:00

res_config_odbc.c

Merged revisions 217638 via svnmerge from

2009-09-10 18:18:39 +00:00

res_config_pgsql.c

Recorded merge of revisions 222309 via svnmerge from

2009-10-06 19:34:48 +00:00

res_config_sqlite.c

AST-2009-005

2009-08-10 19:30:55 +00:00

res_convert.c

Merged revisions 196843 via svnmerge from

2009-05-26 18:30:04 +00:00

res_crypto.c

Merged revisions 205120 via svnmerge from

2009-07-08 15:29:10 +00:00

res_curl.c

Separate the global initialization routines for cURL into its own separate

2008-06-25 16:00:54 +00:00

res_http_post.c

Merged revisions 226099 via svnmerge from

2009-10-27 17:04:41 +00:00

res_indications.c

Merged revisions 168562 via svnmerge from

2009-01-13 19:35:59 +00:00

res_jabber.c

Merged revisions 209098 via svnmerge from

2009-07-27 20:28:28 +00:00

res_limit.c

Merged revisions 217033 via svnmerge from

2009-09-08 15:36:01 +00:00

res_monitor.c

Merged revisions 227945 via svnmerge from

2009-11-04 23:56:19 +00:00

res_musiconhold.c

Merged revisions 222176 via svnmerge from

2009-10-06 01:36:36 +00:00

res_odbc.c

Merged revisions 222176 via svnmerge from

2009-10-06 01:36:36 +00:00

res_phoneprov.c

Merged revisions 222176 via svnmerge from

2009-10-06 01:36:36 +00:00

res_realtime.c

Merged revisions 165318 via svnmerge from

2008-12-17 21:25:32 +00:00

res_smdi.c

AST-2009-005

2009-08-10 19:30:55 +00:00

res_snmp.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

res_speech.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

res_timing_dahdi.c

Merged revisions 199743 via svnmerge from

2009-06-09 16:33:31 +00:00

res_timing_pthread.c

Merged revisions 199743 via svnmerge from

2009-06-09 16:33:31 +00:00