Revert "fix smart http bug"

This reverts commit 3b18906.
Tanson · Mar 28, 2016 · b4be027 · b4be027
1 parent 3b18906
commit b4be027
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/templates/smart-http/service.html.ep b/templates/smart-http/service.html.ep
@@ -42,21 +42,24 @@
   $cb = sub {
     my $c = shift;
     if (@ready = $s->can_read) {
+      $output = '';
       for my $handle (@ready) {
 
         if (sysread($handle, my $buf, $buffer_size)) {
+          #warn `ps axuww|grep gitprep` if $k % 3000 == 0;
+
           if ($handle == $cerr) {
-            $error .= $buf if defined $buf;
+            $error .= $buf;
           }
           else {
-            $output .= $buf if defined $buf;
+            $output .= $buf;
           }
         }
         else {
           $s->remove($handle);
         }
       }
-      $c->write_chunk($output, $cb) if defined $output;
+      $c->write_chunk($output, $cb);
     }
     else {
       $c->finish;

diff --git a/xt/smart_http.t b/xt/smart_http.t
@@ -89,6 +89,25 @@ note 'Smart HTTP';
   $t->content_like(qr/^001e# service=git-upload-pack/);
   $t->content_like(qr/multi_ack_detailed/);
 
+  # /git-upload-pack
+  {
+    my $content = <<EOS;
+006fwant 6410316f2ed260666a8a6b9a223ad3c95d7abaed multi_ack_detailed no-done side-band-64k thin-pack ofs-delta
+0032want 6410316f2ed260666a8a6b9a223ad3c95d7abaed
+00000009done
+EOS
+    $t->post_ok(
+      '/kimoto/t1.git/git-upload-pack',
+      {
+        'Content-Type' => 'application/x-git-upload-pack-request',
+        'Content-Length' => 174,
+        'Content'        => $content
+      }
+    );
+    $t->status_is(200);
+    $t->content_type_is('application/x-git-upload-pack-result');
+  }
+
   # /info/refs recieve-pack request(Basic authentication)
   $t->get_ok('/kimoto/t1.git/info/refs?service=git-receive-pack');
   $t->status_is(401);
@@ -116,26 +135,6 @@ note 'Smart HTTP';
   );
   $t->status_is(200);
   $t->content_type_is('application/x-git-receive-pack-result');
-
-  # /git-upload-pack
-  {
-    $main::ppp = 1;
-    my $content = <<EOS;
-006fwant 6410316f2ed260666a8a6b9a223ad3c95d7abaed multi_ack_detailed no-done side-band-64k thin-pack ofs-delta
-0032want 6410316f2ed260666a8a6b9a223ad3c95d7abaed
-00000009done
-EOS
-    $t->post_ok(
-      '/kimoto/t1.git/git-upload-pack',
-      {
-        'Content-Type' => 'application/x-git-upload-pack-request',
-        'Content-Length' => 174,
-        'Content'        => $content
-      }
-    );
-    $t->status_is(200);
-    $t->content_type_is('application/x-git-upload-pack-result');
-  }
 }
 
 note 'Private repository and collaborator';