Merge remote-tracking branch 'origin/master'

new_admincp/applications/libraries/UploadFile.php

@@ -568,7 +568,7 @@ class UploadFile
                 break;
             case 'group3':
                 //$this->strServerSite=33;暂时改成31
-                $this->strServerSite=33;
+                $this->strServerSite=35;
                 break;
         }
     }
@@ -1128,6 +1128,7 @@ class UploadFile
         //$this->writelog("[".$_COOKIE['bbuserid']."]".date("Y-m-d H:i:s")." upload errno: " . fastdfs_get_last_error_no() . ", error info: " . fastdfs_get_last_error_info()." ".$url."\r\n");
 
         fastdfs_disconnect_server($tracker);
+        fastdfs_tracker_close_all_connections();
         //$this->writelog("[".$_COOKIE['bbuserid']."]".date("Y-m-d H:i:s")." disconnect errno: " . fastdfs_get_last_error_no() . ", error info: " . fastdfs_get_last_error_info()."\r\n");
 
         return $url;