diff options
| author | Robin Appelman <robin@icewind.nl> | 2019-03-04 16:35:20 +0100 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2019-03-04 16:40:45 +0100 |
| commit | 594075f84138fc6c5ee0618f6e5df9e006f19008 (patch) | |
| tree | 1fcde6234e881c29f04a548f474f0a6a38dc0aed /apps/files_external | |
| parent | 23d4e910a8fbfb548ca2a62010f8cb2a54eab36d (diff) | |
| download | nextcloud-server-594075f84138fc6c5ee0618f6e5df9e006f19008.tar.gz nextcloud-server-594075f84138fc6c5ee0618f6e5df9e006f19008.zip | |
update icewind/smb to 3.0.2
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'apps/files_external')
4 files changed, 18 insertions, 14 deletions
diff --git a/apps/files_external/3rdparty/composer.json b/apps/files_external/3rdparty/composer.json index 218a42c689b..06911c05fe9 100644 --- a/apps/files_external/3rdparty/composer.json +++ b/apps/files_external/3rdparty/composer.json @@ -9,6 +9,6 @@ }, "require": { "icewind/streams": "0.6.1", - "icewind/smb": "3.0.1" + "icewind/smb": "3.0.2" } } diff --git a/apps/files_external/3rdparty/composer.lock b/apps/files_external/3rdparty/composer.lock index 10c6fa31afe..329a73dfe98 100644 --- a/apps/files_external/3rdparty/composer.lock +++ b/apps/files_external/3rdparty/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2cf7fdc531a149399b36b1a7a92ba79b", + "content-hash": "1357a8ac93fc039db0cf2c5cf5a45f13", "packages": [ { "name": "icewind/smb", - "version": "v3.0.1", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/icewind1991/SMB.git", - "reference": "bd43cdecd09ffe289fd2881761d4c72e60c95aeb" + "reference": "55b7d1a71f5c031a0257e321bf5fc5281b7cf4a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/icewind1991/SMB/zipball/bd43cdecd09ffe289fd2881761d4c72e60c95aeb", - "reference": "bd43cdecd09ffe289fd2881761d4c72e60c95aeb", + "url": "https://api.github.com/repos/icewind1991/SMB/zipball/55b7d1a71f5c031a0257e321bf5fc5281b7cf4a9", + "reference": "55b7d1a71f5c031a0257e321bf5fc5281b7cf4a9", "shasum": "" }, "require": { @@ -45,7 +45,7 @@ } ], "description": "php wrapper for smbclient and libsmbclient-php", - "time": "2019-02-06T16:53:32+00:00" + "time": "2019-03-04T15:12:50+00:00" }, { "name": "icewind/streams", diff --git a/apps/files_external/3rdparty/composer/installed.json b/apps/files_external/3rdparty/composer/installed.json index d8f063052b8..06fed9ebadb 100644 --- a/apps/files_external/3rdparty/composer/installed.json +++ b/apps/files_external/3rdparty/composer/installed.json @@ -1,17 +1,17 @@ [ { "name": "icewind/smb", - "version": "v3.0.1", - "version_normalized": "3.0.1.0", + "version": "v3.0.2", + "version_normalized": "3.0.2.0", "source": { "type": "git", "url": "https://github.com/icewind1991/SMB.git", - "reference": "bd43cdecd09ffe289fd2881761d4c72e60c95aeb" + "reference": "55b7d1a71f5c031a0257e321bf5fc5281b7cf4a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/icewind1991/SMB/zipball/bd43cdecd09ffe289fd2881761d4c72e60c95aeb", - "reference": "bd43cdecd09ffe289fd2881761d4c72e60c95aeb", + "url": "https://api.github.com/repos/icewind1991/SMB/zipball/55b7d1a71f5c031a0257e321bf5fc5281b7cf4a9", + "reference": "55b7d1a71f5c031a0257e321bf5fc5281b7cf4a9", "shasum": "" }, "require": { @@ -21,7 +21,7 @@ "require-dev": { "phpunit/phpunit": "^5.7" }, - "time": "2019-02-06T16:53:32+00:00", + "time": "2019-03-04T15:12:50+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Connection.php b/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Connection.php index 7eddb85ac4f..7ac070e9709 100644 --- a/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Connection.php +++ b/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Connection.php @@ -66,7 +66,11 @@ class Connection extends RawConnection { $this->parser->checkConnectionError($promptLine); $output = array(); - $line = $this->readLine(); + if (!$this->isPrompt($promptLine)) { + $line = $promptLine; + } else { + $line = $this->readLine(); + } if ($line === false) { $this->unknownError($promptLine); } |