Merge branch 'MDL-78002_402' of https://github.com/stronk7/moodle int…

…o MOODLE_402_STABLE
moodle · May 4, 2023 · 2138619 · 2138619
2 parents 97f6672 + c6ff4c5
commit 2138619
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/lib/classes/moodlenet/moodlenet_client.php b/lib/classes/moodlenet/moodlenet_client.php
@@ -72,16 +72,23 @@ public function create_resource_from_stored_file(
 
         $moodleneturl = $this->oauthclient->get_issuer()->get('baseurl');
         $apiurl = rtrim($moodleneturl, '/') . self::API_CREATE_RESOURCE_URI;
+        $stream = $file->get_psr_stream();
 
         $requestdata = $this->prepare_file_share_request_data(
             $file->get_filename(),
             $file->get_mimetype(),
-            $file->get_psr_stream(),
+            $stream,
             $resourcename,
             $resourcedescription,
         );
 
-        return $this->httpclient->request('POST', $apiurl, $requestdata);
+        try {
+            $response = $this->httpclient->request('POST', $apiurl, $requestdata);
+        } finally {
+            $stream->close(); // Always close the request stream ASAP. Or it will remain open till shutdown/destruct.
+        }
+
+        return $response;
     }
 
     /**

diff --git a/lib/filestorage/tests/file_system_test.php b/lib/filestorage/tests/file_system_test.php
@@ -1093,6 +1093,7 @@ public function test_get_psr_stream(): void {
         $this->assertInstanceOf(\Psr\Http\Message\StreamInterface::class, $stream);
         $this->assertEquals(file_get_contents(__FILE__), $stream->getContents());
         $this->assertFalse($stream->isWritable());
+        $stream->close();
     }
 
     /**

diff --git a/lib/filestorage/tests/stored_file_test.php b/lib/filestorage/tests/stored_file_test.php
@@ -118,6 +118,7 @@ public function test_get_psr_stream(): void {
         $this->assertInstanceOf(\Psr\Http\Message\StreamInterface::class, $stream);
         $this->assertEquals(file_get_contents($filepath), $stream->getContents());
         $this->assertFalse($stream->isWritable());
+        $stream->close();
     }
 
 }