mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14513 from nextcloud/smb-3.0.2-14 

update icewind/smb to 3.0.2
This commit is contained in:
Roeland Jago Douma 2019-03-04 21:28:20 +01:00 committed by GitHub
parent 7610e38089 79abac9084
commit 21dd025760
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_external/3rdparty/composer.json vendored
View File

@ -9,6 +9,6 @@
}, },
"require": { "require": {
"icewind/streams": "0.6.1", "icewind/streams": "0.6.1",
"icewind/smb": "3.0.1" "icewind/smb": "3.0.2"
} }
} }

12
apps/files_external/3rdparty/composer.lock generated vendored
View File

@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "2cf7fdc531a149399b36b1a7a92ba79b", "content-hash": "1357a8ac93fc039db0cf2c5cf5a45f13",
"packages": [ "packages": [
{ {
"name": "icewind/smb", "name": "icewind/smb",
"version": "v3.0.1", "version": "v3.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/icewind1991/SMB.git", "url": "https://github.com/icewind1991/SMB.git",
"reference": "bd43cdecd09ffe289fd2881761d4c72e60c95aeb" "reference": "55b7d1a71f5c031a0257e321bf5fc5281b7cf4a9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/bd43cdecd09ffe289fd2881761d4c72e60c95aeb", "url": "https://api.github.com/repos/icewind1991/SMB/zipball/55b7d1a71f5c031a0257e321bf5fc5281b7cf4a9",
"reference": "bd43cdecd09ffe289fd2881761d4c72e60c95aeb", "reference": "55b7d1a71f5c031a0257e321bf5fc5281b7cf4a9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -45,7 +45,7 @@
} }
], ],
"description": "php wrapper for smbclient and libsmbclient-php", "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", "name": "icewind/streams",

12
apps/files_external/3rdparty/composer/installed.json vendored
View File

@ -1,17 +1,17 @@
[ [
{ {
"name": "icewind/smb", "name": "icewind/smb",
"version": "v3.0.1", "version": "v3.0.2",
"version_normalized": "3.0.1.0", "version_normalized": "3.0.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/icewind1991/SMB.git", "url": "https://github.com/icewind1991/SMB.git",
"reference": "bd43cdecd09ffe289fd2881761d4c72e60c95aeb" "reference": "55b7d1a71f5c031a0257e321bf5fc5281b7cf4a9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/bd43cdecd09ffe289fd2881761d4c72e60c95aeb", "url": "https://api.github.com/repos/icewind1991/SMB/zipball/55b7d1a71f5c031a0257e321bf5fc5281b7cf4a9",
"reference": "bd43cdecd09ffe289fd2881761d4c72e60c95aeb", "reference": "55b7d1a71f5c031a0257e321bf5fc5281b7cf4a9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -21,7 +21,7 @@
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.7" "phpunit/phpunit": "^5.7"
}, },
"time": "2019-02-06T16:53:32+00:00", "time": "2019-03-04T15:12:50+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {

4
apps/files_external/3rdparty/icewind/smb/src/Wrapped/Connection.php vendored
View File

@ -66,7 +66,11 @@ class Connection extends RawConnection {
$this->parser->checkConnectionError($promptLine); $this->parser->checkConnectionError($promptLine);
$output = array(); $output = array();
if (!$this->isPrompt($promptLine)) {
$line = $promptLine;
} else {
$line = $this->readLine(); $line = $this->readLine();
}
if ($line === false) { if ($line === false) {
$this->unknownError($promptLine); $this->unknownError($promptLine);
} }