Kolab Groupware OBS

iRony.spec Changed

debian.changelog Changed

iRony-0.4.8.tar.gz/lib/Kolab/DAV/Auth/HTTPBasic.php Changed

iRony-0.4.8.tar.gz/lib/Kolab/DAV/Node.php Changed

@@ -161,7 +161,7 @@
      */
     protected function fileData($name, $data = null)
     {
-        if ($this->data && $this->data'type') {
+        if ($this->data && !empty($this->data'type')) {
             $type = $this->data'type';
         }
         else {
@@ -170,11 +170,10 @@
 
         // $data can be a resource or a string
         if (is_resource($data)) {
-            // $data can be php://input or php://temp
-            // php://input is not seekable, we need to "convert"
-            // it to seekable resource, fstat/rewind later will work
+            // It can be php://input or php://temp resource stream.
+            // php://input is seekable on recent PHP versions, but fstat() fails so we can't use it
             $meta = stream_get_meta_data($data);
-            if (!$meta'seekable') {
+            if (empty($meta'seekable') || fstat($data) === false) {
                 $new_data = fopen('php://temp','r+');
                 stream_copy_to_stream($data, $new_data);
                 rewind($new_data);

iRony.dsc Changed

Changes of Revision 13