Changeset 9753

Show
Ignore:
Timestamp:
05/25/10 14:57:48 (3 years ago)
Author:
p_lindheimer
Message:

................

r9752 | p_lindheimer | 2010-05-25 11:51:42 -0700 (Tue, 25 May 2010) | 6 lines


........

r9751 | p_lindheimer | 2010-05-25 11:41:54 -0700 (Tue, 25 May 2010) | 1 line


increase the ajax and CURL timeout to deal with very slow connections

........

................

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.7

    • Property svnmerge-integrated changed from /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672,9414-9416 /modules/branches/2.8:1-9044,9047,9049-9054,9056-9070,9072-9073,9075,9079-9080,9082-9085,9088-9089,9092-9093,9095-9098,9102,9105,9107-9123,9127-9128,9130-9132,9137,9149-9204,9211-9214,9216,9218-9224,9230-9232,9234,9237-9239,9248-9252,9257-9262,9267-9270,9272-9274,9277-9278,9280,9282,9288-9292,9295,9297,9300-9324,9326-9327,9329-9342,9345-9349,9353-9354,9358,9363-9376,9378-9379,9385,9387-9389,9392-9393,9395-9405,9407-9408,9410,9414-9421,9423-9424,9440,9442,9446-9449,9451-9452,9454-9458,9460-9462,9464-9469,9474-9475,9483-9484,9486,9489,9495,9500-9502,9504,9508,9607 to /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672,9414-9416,9752 /modules/branches/2.8:1-9044,9047,9049-9054,9056-9070,9072-9073,9075,9079-9080,9082-9085,9088-9089,9092-9093,9095-9098,9102,9105,9107-9123,9127-9128,9130-9132,9137,9149-9204,9211-9214,9216,9218-9224,9230-9232,9234,9237-9239,9248-9252,9257-9262,9267-9270,9272-9274,9277-9278,9280,9282,9288-9292,9295,9297,9300-9324,9326-9327,9329-9342,9345-9349,9353-9354,9358,9363-9376,9378-9379,9385,9387-9389,9392-9393,9395-9405,9407-9408,9410,9414-9421,9423-9424,9440,9442,9446-9449,9451-9452,9454-9458,9460-9462,9464-9469,9474-9475,9483-9484,9486,9489,9495,9500-9502,9504,9508,9607

  • modules/branches/2.7/sipstation/module.xml

    r9224 r9753  
    22  <rawname>sipstation</rawname> 
    33  <name>SIPSTATION</name> 
    4   <version>2.7.0.1</version> 
     4  <version>2.7.0.2</version> 
    55  <type>setup</type> 
    66  <category>Basic</category> 
    …… 
    1414  <license>COMMERCIAL</license> 
    1515  <changelog> 
     16    *2.7.0.2* increase ajax and CURL TIMEOUT 
    1617    *2.7.0.1* report proper TEMPNOTAVAIL status when server replies with that 
    1718    *2.7.0.0* spelling, localizations 

  • modules/branches/2.7/sipstation/page.sipstation.php

    r9219 r9753  
    497497  /* On click ajax to pbx and determine extenral network and localnet settings */ 
    498498  $.ajaxSetup({ 
    499     timeout:10000 
     499    timeout:20000 
    500500  }); 
    501501  $("#account-access-button").click(function(){ 

  • modules/branches/2.7/sipstation/sipstation.utility.php

    r9219 r9753  
    253253  curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); 
    254254 
    255   curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10); 
     255  curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 20); 
    256256  // TODO: deal with timeout! 
    257257 
    …… 
    306306  curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); 
    307307 
    308   curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10); 
     308  curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 20); 
    309309  // TODO: deal with timeout! 
    310310