getting rid of some debugging output
[gwvp-mini.git] / gwvpmini / gwvpmini_gitbackend.php
index 424c108..5fe188a 100644 (file)
@@ -223,7 +223,7 @@ function gwvpmini_canManageRepo($userid, $repoid)
 }
 
 
-// TODO: this whole bit needs a re-write
+// TODO: this whole bit needs a re-write - seriously, like totally!
 function gwvpmini_callGitBackend($username, $repo)
 {
        // this is where things become a nightmare
@@ -287,7 +287,7 @@ function gwvpmini_callGitBackend($username, $repo)
 
                $headers = getallheaders();
                
-               error_log("path trans'd is /$repo_base/$repo.git/$euri from $ruri with ".$_REQUEST["q"]." $strrem pre is ".print_r($_REQUEST,true)." and foff ".print_r($headers, true));
+               //error_log("path trans'd is /$repo_base/$repo.git/$euri from $ruri with ".$_REQUEST["q"]." $strrem pre is ".print_r($_REQUEST,true)." and foff ".print_r($headers, true));
                
                $pwd = "/$repo_base/";
                
@@ -323,7 +323,7 @@ function gwvpmini_callGitBackend($username, $repo)
                
                
                $stlimit = 0;
-               $fp = fopen("/tmp/gitup.".rand(0,4000000), "w");
+               //$fp = fopen("/tmp/gitup.".rand(0,4000000), "w");
                $from_client_data = "";
                // i was going to use stream_select, but i feel this works better like this
                while($continue) {
@@ -351,13 +351,13 @@ function gwvpmini_callGitBackend($username, $repo)
                                }
                                if($from_client_data !== false) {
                                        fwrite($pipes[0], $from_client_data);
-                                       fwrite($fp, $from_client_data);
+                                       //fwrite($fp, $from_client_data);
                                }
                                fflush($pipes[0]);
                                //fwrite($fl, $from_client_data);
                                $client_len = strlen($from_client_data);
                        } else {
-                               error_log("client end");
+                               //error_log("client end");
                                $client_len = 0;
                                //$continue = false;
                        }
@@ -381,18 +381,20 @@ function gwvpmini_callGitBackend($username, $repo)
                                                // or something the git-http-backend thing is doing..
                                                // TODO: find out why this happens
                                                $from_cgi_data = preg_replace("/^\r\n/", "", $from_cgi_data_t);
+                                               /*
                                                if(strlen($from_cgi_data)!=strlen($from_cgi_data_t)) {
                                                        error_log("MOOOKS - we did trunc");
                                                } else {
                                                        error_log("MOOOKS - we did not trunc");
-                                               }
+                                               }*/
                                                $firstline = false;
                                        }
                                }
                                
-                               if($from_cgi_data !== false) {
-                                       error_log("send to client");
+                               if($from_cgi_data !== false && $from_cgi_data != "") {
+                                       //error_log("send to client of size ".strlen($from_cgi_data));
                                        echo $from_cgi_data;
+                                       ob_flush();
                                        flush();
                                }
                                $cgi_len = strlen($from_cgi_data);
@@ -407,18 +409,17 @@ function gwvpmini_callGitBackend($username, $repo)
                        else {
                                if($client_len == 0 && $cgi_len == 0) {
                                        usleep(200000);
-                                       error_log("sleep tick");
+                                       //error_log("sleep tick");
                                        $stlimit++;
-                                       if($stlimit > 5000) $continue = false;
+                                       if($stlimit > 300) $continue = false; // if we get no output from git backend after 1 minute, we close..... something went wrong
                                } else {
                                        $stlimit = 0;
-                                       error_log("sizes: $client_len, $cgi_len");
+                                       //error_log("sizes: $client_len, $cgi_len");
                                        if($cgi_len > 0) {
                                                //error_log("from cgi: \"$from_cgi_data\"");
                                        }
                                }
                        }
-                       
                }
                
                
@@ -467,7 +468,7 @@ function gwvpmini_createGitRepo($name, $ownerid, $desc, $defperms, $clonefrom, $
                        $rn = gwvpmini_getRepo(null, $name, null);
                        $rid = $rn["id"];
                        gwvpmini_SetRepoCloning($rid);
-                       gwvpmini_SendMessage("info", "Background clone initiated for $name ($rid) from $clonefrom... your repo will be available once the background clone is finished");
+                       gwvpmini_SendMessageByDb("info", "Background clone initiated for $name ($rid) from $clonefrom... your repo will be available once the background clone is finished", $ownerid);
                        return false;
                }
        } else {
@@ -485,115 +486,5 @@ function gwvpmini_createGitRepo($name, $ownerid, $desc, $defperms, $clonefrom, $
        return true;
 }
 
-function gzdecode($data,&$filename='',&$error='',$maxlength=null)\r
-{\r
-       $len = strlen($data);\r
-       if ($len < 18 || strcmp(substr($data,0,2),"\x1f\x8b")) {\r
-               $error = "Not in GZIP format.";\r
-               return null;  // Not GZIP format (See RFC 1952)\r
-       }\r
-       $method = ord(substr($data,2,1));  // Compression method\r
-       $flags  = ord(substr($data,3,1));  // Flags\r
-       if ($flags & 31 != $flags) {\r
-               $error = "Reserved bits not allowed.";\r
-               return null;\r
-       }\r
-       // NOTE: $mtime may be negative (PHP integer limitations)\r
-       $mtime = unpack("V", substr($data,4,4));\r
-       $mtime = $mtime[1];\r
-       $xfl   = substr($data,8,1);\r
-       $os    = substr($data,8,1);\r
-       $headerlen = 10;\r
-       $extralen  = 0;\r
-       $extra     = "";\r
-       if ($flags & 4) {\r
-               // 2-byte length prefixed EXTRA data in header\r
-               if ($len - $headerlen - 2 < 8) {\r
-                       return false;  // invalid\r
-               }\r
-               $extralen = unpack("v",substr($data,8,2));\r
-               $extralen = $extralen[1];\r
-               if ($len - $headerlen - 2 - $extralen < 8) {\r
-                       return false;  // invalid\r
-               }\r
-               $extra = substr($data,10,$extralen);\r
-               $headerlen += 2 + $extralen;\r
-       }\r
-       $filenamelen = 0;\r
-       $filename = "";\r
-       if ($flags & 8) {\r
-               // C-style string\r
-               if ($len - $headerlen - 1 < 8) {\r
-                       return false; // invalid\r
-               }\r
-               $filenamelen = strpos(substr($data,$headerlen),chr(0));\r
-               if ($filenamelen === false || $len - $headerlen - $filenamelen - 1 < 8) {\r
-                       return false; // invalid\r
-               }\r
-               $filename = substr($data,$headerlen,$filenamelen);\r
-               $headerlen += $filenamelen + 1;\r
-       }\r
-       $commentlen = 0;\r
-       $comment = "";\r
-       if ($flags & 16) {\r
-               // C-style string COMMENT data in header\r
-               if ($len - $headerlen - 1 < 8) {\r
-                       return false;    // invalid\r
-               }\r
-               $commentlen = strpos(substr($data,$headerlen),chr(0));\r
-               if ($commentlen === false || $len - $headerlen - $commentlen - 1 < 8) {\r
-                       return false;    // Invalid header format\r
-               }\r
-               $comment = substr($data,$headerlen,$commentlen);\r
-               $headerlen += $commentlen + 1;\r
-       }\r
-       $headercrc = "";\r
-       if ($flags & 2) {\r
-               // 2-bytes (lowest order) of CRC32 on header present\r
-               if ($len - $headerlen - 2 < 8) {\r
-                       return false;    // invalid\r
-               }\r
-               $calccrc = crc32(substr($data,0,$headerlen)) & 0xffff;\r
-               $headercrc = unpack("v", substr($data,$headerlen,2));\r
-               $headercrc = $headercrc[1];\r
-               if ($headercrc != $calccrc) {\r
-                       $error = "Header checksum failed.";\r
-                       return false;    // Bad header CRC\r
-               }\r
-               $headerlen += 2;\r
-       }\r
-       // GZIP FOOTER\r
-       $datacrc = unpack("V",substr($data,-8,4));\r
-       $datacrc = sprintf('%u',$datacrc[1] & 0xFFFFFFFF);\r
-       $isize = unpack("V",substr($data,-4));\r
-       $isize = $isize[1];\r
-       // decompression:\r
-       $bodylen = $len-$headerlen-8;\r
-       if ($bodylen < 1) {\r
-               // IMPLEMENTATION BUG!\r
-               return null;\r
-       }\r
-       $body = substr($data,$headerlen,$bodylen);\r
-       $data = "";\r
-       if ($bodylen > 0) {\r
-               switch ($method) {\r
-                       case 8:\r
-                               // Currently the only supported compression method:\r
-                               $data = gzinflate($body,$maxlength);\r
-                               break;\r
-                       default:\r
-                               $error = "Unknown compression method.";\r
-                               return false;\r
-               }\r
-       }  // zero-byte body content is allowed\r
-       // Verifiy CRC32\r
-       $crc   = sprintf("%u",crc32($data));\r
-       $crcOK = $crc == $datacrc;\r
-       $lenOK = $isize == strlen($data);\r
-       if (!$lenOK || !$crcOK) {\r
-               $error = ( $lenOK ? '' : 'Length check FAILED. ') . ( $crcOK ? '' : 'Checksum FAILED.');\r
-               return false;\r
-       }\r
-       return $data;\r
-}
+
 ?>
\ No newline at end of file