R30093 - /branches/1.6/egw-pear/HTTP/WebDAV/Server.php

Author: leithoff
New Revision: 30093

URL: http://www.egroupware.org/viewvc/egroupware?rev=30093&view=rev
Log:
fix to match non-numeric timeout; provided by A.Stoeckel

Modified:
branches/1.6/egw-pear/HTTP/WebDAV/Server.php

Modified: branches/1.6/egw-pear/HTTP/WebDAV/Server.php
URL: http://www.egroupware.org/viewvc/egroupware/branches/1.6/egw-pear/HTTP/WebDAV/Server.php?rev=30093&r1=30092&r2=30093&view=diff

— branches/1.6/egw-pear/HTTP/WebDAV/Server.php (original)
+++ branches/1.6/egw-pear/HTTP/WebDAV/Server.php Mon May 10 10:29:12 2010
@@ -1619,13 +1619,20 @@

     if ($http_stat{0} == 2) { // 2xx states are ok
         if ($options["timeout"]) {
  •            // more than a million is considered an absolute timestamp
    
  •            // less is more likely a relative value
    
  •            if ($options["timeout"]>1000000) {
    
  •                $timeout = "Second-".($options['timeout']-time());
    
  •            } else {
    
  •                $timeout = "Second-$options[timeout]";
    
  •            }
    
  •   		if (is_numeric($options["timeout"]))
    
  •   		{
    
  •   			// more than a million is considered an absolute timestamp
    
  •   			// less is more likely a relative value
    
  •   			if ($options["timeout"]>1000000) {
    
  •   				$timeout = "Second-".($options['timeout']-time());
    
  •   			} else {
    
  •   				$timeout = "Second-$options[timeout]";
    
  •   			}
    
  •   		}
    
  •   		else
    
  •   		{
    
  •   			$timeout = $options[timeout];
    
  •   		}
           } else {
               $timeout = "Infinite";
           }
    


eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs