Merge pull request #16182 from mlschroe/master

[backend] BSHTTP::read_data: save some memory
openSUSE · May 23, 2024 · 92bd65f · 92bd65f
2 parents c654b55 + 1a2ae6b
commit 92bd65f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/backend/BSHTTP.pm b/src/backend/BSHTTP.pm
@@ -296,12 +296,11 @@ sub read_data {
 	$cl = $maxl = length($qu);
       }
     }
-    $cl -= $maxl if defined($cl);
-    $ret = substr($qu, 0, $maxl);
+    $cl -= $maxl if defined $cl;
     $req->{'__cl'} = $cl;
-    $req->{'__data'} = substr($qu, $maxl);
+    $req->{'__data'} = substr($qu, $maxl, length($qu) - $maxl, '');
     $req->{'__eof'} = 1 if defined($cl) && $cl == 0;
-    return $ret;
+    return $qu;
   }
 }
 

diff --git a/src/backend/BSServer.pm b/src/backend/BSServer.pm
@@ -448,6 +448,7 @@ sub server {
       last unless $pid > 0;
       my $slot = delete $chld{$pid};
       $slot = delete $chld2{$pid} unless defined $slot;
+      printf("Child %d died from signal %d\n", $pid, $? & 127) if $? & 127;
       if (defined($slot)) {
         if ($serverstatus_ok && defined(sysseek(STA, $slot * 256, Fcntl::SEEK_SET))) {
 	  syswrite(STA, "\0" x 256, 256);