[Opalvoip-svn] SF.net SVN: opalvoip:[29395] ptlib/trunk
Brought to you by:
csoutheren,
rjongbloed
From: <rjo...@us...> - 2013-03-30 05:58:50
|
Revision: 29395 http://sourceforge.net/p/opalvoip/code/29395 Author: rjongbloed Date: 2013-03-30 05:58:47 +0000 (Sat, 30 Mar 2013) Log Message: ----------- Merged revision(s) 29381-29393 from ptlib/branches/v2_12: r29390 Make sure OnInterrupt() is called in service process. --------------------- r29389 Added --timeout to sevice process terminate/kill control, and default increased to 30 seconds. --------------------- r29388 Fixed minor issues with user feedback in service process control. --------------------- r29387 Fixed subtle problem with handling signals when service process run as a daemon. --------------------- r29386 Prevent occasional output of a trace log line to stderr when ending run of program. --------------------- r29382 Changed Windows configure program so can write WIX installer based XML for version numbers. Revision Links: -------------- http://sourceforge.net/p/opalvoip/code/29390 http://sourceforge.net/p/opalvoip/code/29389 http://sourceforge.net/p/opalvoip/code/29388 http://sourceforge.net/p/opalvoip/code/29387 http://sourceforge.net/p/opalvoip/code/29386 http://sourceforge.net/p/opalvoip/code/29382 Modified Paths: -------------- ptlib/trunk/configure.exe ptlib/trunk/include/ptlib/unix/ptlib/pprocess.h ptlib/trunk/src/ptlib/common/osutils.cxx ptlib/trunk/src/ptlib/unix/svcproc.cxx ptlib/trunk/src/ptlib/unix/tlib.cxx ptlib/trunk/tools/configure/configure.cpp Property Changed: ---------------- ptlib/trunk/ Index: ptlib/trunk =================================================================== --- ptlib/trunk 2013-03-30 05:54:33 UTC (rev 29394) +++ ptlib/trunk 2013-03-30 05:58:47 UTC (rev 29395) Property changes on: ptlib/trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -4,7 +4,7 ## /ptlib/branches/Sirius_B:24839,24844,24968,24982 /ptlib/branches/csoutheren/LalandeBranch1:23331-23333,23723 /ptlib/branches/v2_10:25177-29189 -/ptlib/branches/v2_12:28485-29380 +/ptlib/branches/v2_12:28485-29393 /ptlib/branches/v2_2:20746,20791,20827,22014,22942 /ptlib/branches/v2_4:21086,21094,21147,21160,21185,21281,21296,21305,21322,21337,21363,21467,21471-21472,21506,21508,21623,21695,21744,21746,21763,22241,22958,23045-23046,23061,23066,23712 /ptlib/branches/v2_6:22195,22243,22295,22304,22311,22317,22320,22356,22458,22509,22587,22601-22602,22611,22629,22633,22673,22681,22729,22731-22732,22736,22742,22848,22960,22992,23161,23163,23167,23169,23177,23239,23291,23298,23336,23429,23595,23823,23827,23873,24816 \ No newline at end of property Modified: ptlib/trunk/configure.exe =================================================================== --- ptlib/trunk/configure.exe 2013-03-30 05:54:33 UTC (rev 29394) +++ ptlib/trunk/configure.exe 2013-03-30 05:58:47 UTC (rev 29395) @@ -1,364 +1,373 @@ MZ\x90-$--\x8B\x8Bj\x8B\xCE\xFF\xD2^_\x8B\xE5]\xC3\xCC\xCC\xCC\xCC\xCCU\x8B\xEC\xF6EV\x8B\xF1\xC7@B-\xF8lB-\xF0tB-u\x89\x8BR\x80zEF8\xE8L\xD6-\x8B\x8Bj\x8B\xCE\xFFҋu\xFCS\xE8\xB2\xE0-\x83}+$+\xC0\xC3\xF2]]\xF2\xC0\xC3\xF2]i\xF2\x89\xC0\xC3\xF2+\xC0\xC3\xF2 \xC0\xC2\xF2T\xC0\xC3\xF2]h\xF2>\xC0\xC3\xF2]^\xF2\xC0\xC3\xF2Rich \xC0\xC3\xF2++\x8B\x8Bj\x8B\xCE\xFF\xD2^_\x8B\xE5]\xC3\xCC\xCC\xCC\xCC̰\xC3\xCC\xCC\xCC\xCC\xCC\xCC\xCC\xCC\xCC\xCC\xCC\xCC̸+\xF88B+\xF0@B+u\x89\x8BR\x80zE5\xD4+\x8B\x8Bj\x8B\xCE\xFFҋu\xFCS\xE8\x85\xDE+\x83} \x83}CC\xCC\xCC\xCC\xCC\xCC\xCC\xCC\xCCU\x8B\xEC\x8BUSVW\x8B\xF9\x8B_;\xD3s?\x8BO\x83\xF9r\x8B\xEB\x8B\xC7\xF9r\x8B\xEB\x8BǍ4;\xF3s\x8BE\xBE\x8BUPQR\xE8\xDE-h\x88B-_^\x83\xC8\xFF[]\xC2\xFF\xF6Et V\xE8!\xDB+hTB+_^\x83\xC8\xFF[]\xC2-h\x88B2-\xC7E\xFCx8B\xCE;\xF3r\x8B˃r\x8B\xEB\x8B\xC7QRP\xE8\x90\xE3\xFF\xFF\x83\xC4\x85\xC0u -;\xF3r ;\xF3\x95\xC0\x85\xC0t\x83\xC7;}u\xB4^[\x8B\xC7_]Ë\xC7_]\xC3\xCC\xCC\xCC\xCC\xCC\xCC\xCC\xCCSV\x8B\xF1\x83~lWr\x8BFXP\xE8\x81\xCC-_^\xB8-hxBx8B+\x89A\x89P\x89B]\xC2+\xDF+hTB\x8Bu\xE4\x8B]\x85\xDBt\x83r\x8B\xEB\x8B\xC7SP\x8BEP\xE8\xF6\xCE+\xC7E\xFC\xF3r\x8B˃r\x8B\xEB\x8B\xC7QRP\xE8p\xE3\xFF\xFF\x83\xC4\x85\xC0u +;\xF3r ;\xF3\x95\xC0\x85\xC0t\x83\xC7;}u\xB4^[\x8B\xC7_]Ë\xC7_]\xC3\xCC\xCC\xCC\xCC\xCC\xCC\xCC\xCCSV\x8B\xF1\x83~lWr\x8BFXP\xE8T\xCA+_^\xB8+hDBx8B+\xF3\xFF\xFF\x8B\xC7_]\xC2 \x8B\x8Bj\x8B\xCE\xFFЋ\x8BE\x8BRP\x8B\xCB\xFFҋM\xF4d\x89 -+ \xBA-\x8BI$\x8B\x8Dz\x899\x88\xB6\xC0\xEB\x8B\xB6\xC0P\x8BB\xFFЃ\xF8\xFF\x85\xBC-\x8BI$\x8B\x8Dz\x899\x88\xB6\xC0\xEB\x8B\xB6\xC0P\x8BB\xFFЃ\xF8\xFFu \x83M\xEC\xE9\xFF\xFF\xFF\x83\xC3\xFF\x83U\xE4\xFF뚋M\x8B\x8BB\xC1\x8BH\x83\xC9\x83x8-+ωU\xE0\x89M\xEC\xEB\xC7E\xEC+\x8BI$\x8B\x8Dz\x899\x88\xB6\xC0\xEB\x8B\xB6\xC0P\x8BB\xFFЃ\xF8\xFFu \x83M\xEC\xE9\xFF\xFF\xFF\x83\xC3\xFF\x83U\xE4\xFF뚋M\x8B\x8BB\xC1\x8BH\x83\xC9\x83x8++ωU\xE0\x89M\xEC\xEB\xC7E\xEC \xBB \x8BI$\x8B\x8DZ\x89\x88\xB6\xC0\xEB\x8B\xB6\xC0P\x8BB\xFFЃ\xF8\xFFu\x8B]\xE8\x83\xCB\x89]\xE8\xEB\xFFM\xEC묋]\xE8;\xDFtI\xEB\x8DI-\x8BI$\x8B\x8Dz\x899\x88\xB6\xC0\xE9\xBC+\x8BI$\x8B\x8Dz\x899\x88\xB6\xC0\xE9\xBC \x8BI$\x8B\x8DZ\x89\x8B]\xEC\x88\xB6\xC0\xEB\x8B\xB6\xC0P\x8BB\xFFЃ\xF8\xFFu\xBB-\x8BI$\x8B\x8DZ\x89\x8B]\xEC\x88\xB6\xC0\xEB\x8B\xB6\xC0P\x8BB\xFFЃ\xF8\xFFu\xBB-\x8D~WhHB-Wh B-h8\x96B-h8\x96B-h\x88B-hxB-hxB-\xEB(\x85\xFFu\xEE\x89~\x83\xF9r\x8B_\xC6-h\x88B-hxB-hxB-hxB-hxB-hxB-h\x88B-hxB-hxB-hxB-hxB+\xAD+\x8D~WhB+Wh\xE8B+hX\x96B+hX\x96B+hTB+hDB+hDB+\xEB(\x85\xFFu\xEE\x89~\x83\xF9r\x8B_\xC6+hTB+hDB+hDB+hDB+hDB+hDB+hTB+hDB+hDB+\xAA+hDB+hDBC2-\x8DM\xD4\xE8\xCF\xD7\xFF\xFF\xB0\x8BM\xF4d\x89 -xB9-hxB-hxB-hxB-\x8B\xCE\xE8O\xF3\xFF\xFF\x8B\x8B@3\xFF\xF6D0u\x8BD08\x8B\x8BȋB4\xFFЃ\xF8\xFFu\xBF++\x8DM\xD4\xE8o\xD7\xFF\xFF\xB0\x8BM\xF4d\x89 ++hDB+hDB+hDB+\x8B\xCE\xE8O\xF3\xFF\xFF\x8B\x8B@3\xFF\xF6D0u\x8BD08\x8B\x8BȋB4\xFFЃ\xF8\xFFu\xBF \x8BV0+ɉ -9FDu \x8BvT\xBE\xC3VP\xE88B]\x83~T-\x8B\x89\xC7-\x83\xFErj\x83M\xE8\xC7E\xFC\xC5P\x8DE\xF4d\xA3FF\x8B\xC6^\x8B\xE5]\xC3\xCC\xCC\xCCU\x8B\xECj\xFFh\xD9\xFBA\x8BUj\xFFj-\x94F\xFFj P\x8DU\xD4R\xC7E\xFC-\xE8\xF4\xFF\xFF\x83\xC40\x8B\x8D \xFF\xFF\xFFj\xFF3\xF6VPh\xFF\xFF\xFFQ\x8B\xCB\xC6E\xFC\xE8\x86\xDC\xFF\xFF\x83}\x94r\x8BU\x80R\xE8\xFC\x8DB-^[\x89\x87-\x8B @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |