[bugs] [Bug 1008] Changed - Modul chora: Annotation fails with internalserver error

bugs@bugs.horde.org bugs@bugs.horde.org
Tue, 20 Aug 2002 03:20:37 -0300


http://bugs.horde.org/show_bug.cgi?id=1008

*** shadow/1008	Tue Aug 20 03:20:17 2002
--- shadow/1008.tmp.3845	Tue Aug 20 03:20:37 2002
***************
*** 3,10 ****
  Version: 2.2 Stable
  Platform: PHP Code
  OS/Version: Linux
! Status: ASSIGNED   
! Resolution: 
  Severity: normal
  Priority: P2
  Component: Core
--- 3,10 ----
  Version: 2.2 Stable
  Platform: PHP Code
  OS/Version: Linux
! Status: RESOLVED   
! Resolution: FIXED
  Severity: normal
  Priority: P2
  Component: Core
***************
*** 55,57 ****
--- 55,86 ----
  Hope I could support you a bit.
  Your frame - WORK - is a very fine pice of code !
  
+ 
+ ------- Additional Comments From anil@recoil.org  08/20/02 03:20 -------
+ I've applied the following patch to the HEAD branch of Chora, which
+ should ignore any extraneous E respones from the server.  Any chance
+ you could try it out and make sure it works as expected?  thanks.
+ 
+ Index: Annotate.php
+ ===================================================================
+ RCS file: /repository/chora/lib/CVSLib/Annotate.php,v
+ retrieving revision 1.11
+ diff -u -r1.11 Annotate.php
+ --- Annotate.php        5 May 2002 23:55:40 -0000       1.11
+ +++ Annotate.php        20 Aug 2002 06:16:08 -0000
+ @@ -77,7 +77,12 @@
+ 
+          $lines = array();
+          $line = fgets($fl, 4096);
+ -        if (!preg_match("|^E\s+Annotations for $where|", $line)) {
+ +
+ +        while ($line && !preg_match("|^E\s+Annotations for $where|", $line)) {
+ +            $line = fgets($fl, 4096);
+ +        }
+ +
+ +        if (!$line) {
+              return new CVSLib_Error(CVSLIB_INTERNAL_ERROR, "Unable to 
+ annotate; server said: $line");
+          }
+ 
+