function gwvpmini_gitBackendInterface()
{
// and this is where i re-code the git backend interface from scratch
- global $BASE_URL, $cmd_line_tool;
+ global $BASE_URL, $cmd_line_tool, $git_cli_cmd;
header_remove("Pragma");\r
header_remove("Cache-Control");\r
// TODO: this whole bit needs a re-write - seriously, like totally!
function gwvpmini_callGitBackend($username, $repo)
{
+
+ global $git_backend_cmd, $git_cli_cmd, $php_cli_cmd, $data_directory, $cmd_line_tool;\r
+
// this is where things become a nightmare
$fh = fopen('php://input', "r");
$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/";
- $proc = proc_open("/usr/lib/git-core/git-http-backend", array(array("pipe","rb"),array("pipe","wb"),array("file","/tmp/err", "a")), $pipes, $pwd, $procenv);
+ $proc = proc_open("$git_backend_cmd", array(array("pipe","rb"),array("pipe","wb"),array("file","/tmp/err", "a")), $pipes, $pwd, $procenv);
$untilblank = false;
while(!$untilblank&&!feof($pipes[1])) {
$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) {
if(isset($headers["Content-Length"])) {
$cl = $headers["Content-Length"];
while(strlen($from_client_data) < $cl) {
- error_log("re-read ".strlen($from_client_data));
+ error_log("re-read ".strlen($from_client_data)." of $cl");
$from_client_data .= fread($fh, $cl);
}
} else $from_client_data = fread($fh,8192);
}
}
if($from_client_data !== false) {
+
+ // push the data from the client straight to backend
fwrite($pipes[0], $from_client_data);
- fwrite($fp, $from_client_data);
+ //fwrite($fp, $from_client_data);
}
fflush($pipes[0]);
//fwrite($fl, $from_client_data);
// 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);
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\"");
}
// 2 - only owner can see anything
function gwvpmini_createGitRepo($name, $ownerid, $desc, $defperms, $clonefrom, $isremoteclone)
{
- global $cmd_line_tool;
+ global $cmd_line_tool,$git_cli_cmd,$php_cli_cmd;
$repo_base = gwvpmini_getConfigVal("repodir");
if($clonefrom !== false) {
error_log("how did i end up in clonefrom? $clonefrom");
if(!$isremoteclone) {
- exec("/usr/bin/git clone --bare $repo_base/$clonefrom.git $repo_base/$name.git >> /tmp/gitlog 2>&1");
+ exec("$git_cli_cmd clone --bare $repo_base/$clonefrom.git $repo_base/$name.git >> /tmp/gitlog 2>&1");
gwvpmini_AddRepo($name, $desc, $ownerid, $defperms, $clonefrom);
} else {
// we do this from an outside call in the background
- $cmd = "/usr/bin/php $cmd_line_tool $clonefrom $name backgroundclone >> /tmp/gitlog 2>&1 &";
+ $cmd = "$php_cli_cmd $cmd_line_tool $clonefrom $name backgroundclone >> /tmp/gitlog 2>&1 &";
error_log("cmd called as $cmd");
exec($cmd);
gwvpmini_AddRepo($name, $desc, $ownerid, $defperms, $clonefrom);
// phew, this works, but i tell you this - bundles arent quite as nice as they should be
// error_log("would create $repo_base/$name.git");
- exec("/usr/bin/git init $repo_base/$name.git --bare >> /tmp/gitlog 2>&1");
+ exec("$git_cli_cmd init $repo_base/$name.git --bare >> /tmp/gitlog 2>&1");
chdir("$repo_base/$name.git");
- exec("/usr/bin/git update-server-info");
+ exec("$git_cli_cmd update-server-info");
// gwvpmini_AddRepo($reponame, $repodesc, $repoowner, $defaultperms = 0)
gwvpmini_AddRepo($name, $desc, $ownerid, $defperms, $clonefrom);