mirror of
https://github.com/nextcloud/server.git
synced 2026-06-12 10:10:49 -04:00
update icewind/smb to 3.5.4
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
parent
85a879894f
commit
30b7147a31
7 changed files with 24 additions and 23 deletions
2
apps/files_external/3rdparty/composer.json
vendored
2
apps/files_external/3rdparty/composer.json
vendored
|
|
@ -9,6 +9,6 @@
|
|||
},
|
||||
"require": {
|
||||
"icewind/streams": "0.7.4",
|
||||
"icewind/smb": "3.5.3"
|
||||
"icewind/smb": "3.5.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
14
apps/files_external/3rdparty/composer.lock
generated
vendored
14
apps/files_external/3rdparty/composer.lock
generated
vendored
|
|
@ -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": "f376ee0d775d5d7f1fbac7730eeaff0e",
|
||||
"content-hash": "5d34e39627716fec1b5b11ab6a667e53",
|
||||
"packages": [
|
||||
{
|
||||
"name": "icewind/smb",
|
||||
"version": "v3.5.3",
|
||||
"version": "v3.5.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/icewind1991/SMB.git",
|
||||
"reference": "3e25d3116111064ec45a0e1b351fc4baf396ca43"
|
||||
"reference": "76995aa11c14e39bccd0f2370ed63b2f8f623a6d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/3e25d3116111064ec45a0e1b351fc4baf396ca43",
|
||||
"reference": "3e25d3116111064ec45a0e1b351fc4baf396ca43",
|
||||
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/76995aa11c14e39bccd0f2370ed63b2f8f623a6d",
|
||||
"reference": "76995aa11c14e39bccd0f2370ed63b2f8f623a6d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -49,9 +49,9 @@
|
|||
"description": "php wrapper for smbclient and libsmbclient-php",
|
||||
"support": {
|
||||
"issues": "https://github.com/icewind1991/SMB/issues",
|
||||
"source": "https://github.com/icewind1991/SMB/tree/v3.5.3"
|
||||
"source": "https://github.com/icewind1991/SMB/tree/v3.5.4"
|
||||
},
|
||||
"time": "2022-05-27T15:00:33+00:00"
|
||||
"time": "2022-05-30T15:18:19+00:00"
|
||||
},
|
||||
{
|
||||
"name": "icewind/streams",
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
"packages": [
|
||||
{
|
||||
"name": "icewind/smb",
|
||||
"version": "v3.5.3",
|
||||
"version_normalized": "3.5.3.0",
|
||||
"version": "v3.5.4",
|
||||
"version_normalized": "3.5.4.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/icewind1991/SMB.git",
|
||||
"reference": "3e25d3116111064ec45a0e1b351fc4baf396ca43"
|
||||
"reference": "76995aa11c14e39bccd0f2370ed63b2f8f623a6d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/3e25d3116111064ec45a0e1b351fc4baf396ca43",
|
||||
"reference": "3e25d3116111064ec45a0e1b351fc4baf396ca43",
|
||||
"url": "https://api.github.com/repos/icewind1991/SMB/zipball/76995aa11c14e39bccd0f2370ed63b2f8f623a6d",
|
||||
"reference": "76995aa11c14e39bccd0f2370ed63b2f8f623a6d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
"phpunit/phpunit": "^8.5|^9.3.8",
|
||||
"psalm/phar": "^4.3"
|
||||
},
|
||||
"time": "2022-05-27T15:00:33+00:00",
|
||||
"time": "2022-05-30T15:18:19+00:00",
|
||||
"type": "library",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
"description": "php wrapper for smbclient and libsmbclient-php",
|
||||
"support": {
|
||||
"issues": "https://github.com/icewind1991/SMB/issues",
|
||||
"source": "https://github.com/icewind1991/SMB/tree/v3.5.3"
|
||||
"source": "https://github.com/icewind1991/SMB/tree/v3.5.4"
|
||||
},
|
||||
"install-path": "../icewind/smb"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../',
|
||||
'aliases' => array(),
|
||||
'reference' => 'ac79137816709b4adc6b2e21cc52c807381c4baf',
|
||||
'reference' => '15d43dcc6226b92c0d51d643ef8c5ab1339cae48',
|
||||
'name' => 'files_external/3rdparty',
|
||||
'dev' => true,
|
||||
),
|
||||
|
|
@ -16,16 +16,16 @@
|
|||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../',
|
||||
'aliases' => array(),
|
||||
'reference' => 'ac79137816709b4adc6b2e21cc52c807381c4baf',
|
||||
'reference' => '15d43dcc6226b92c0d51d643ef8c5ab1339cae48',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'icewind/smb' => array(
|
||||
'pretty_version' => 'v3.5.3',
|
||||
'version' => '3.5.3.0',
|
||||
'pretty_version' => 'v3.5.4',
|
||||
'version' => '3.5.4.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../icewind/smb',
|
||||
'aliases' => array(),
|
||||
'reference' => '3e25d3116111064ec45a0e1b351fc4baf396ca43',
|
||||
'reference' => '76995aa11c14e39bccd0f2370ed63b2f8f623a6d',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'icewind/streams' => array(
|
||||
|
|
|
|||
|
|
@ -75,7 +75,8 @@ class RawConnection {
|
|||
'CLI_NO_READLINE' => 1, // Not all distros build smbclient with readline, disable it to get consistent behaviour
|
||||
'LC_ALL' => Server::LOCALE,
|
||||
'LANG' => Server::LOCALE,
|
||||
'COLUMNS' => 8192 // prevent smbclient from line-wrapping it's output
|
||||
'COLUMNS' => 8192, // prevent smbclient from line-wrapping it's output
|
||||
'TZ' => 'UTC',
|
||||
]);
|
||||
$this->process = proc_open($this->command, $descriptorSpec, $this->pipes, '/', $env);
|
||||
if (!$this->isValid()) {
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ class Server extends AbstractServer {
|
|||
throw new ConnectionException((string)$connection->readLine());
|
||||
}
|
||||
|
||||
$parser = new Parser($this->timezoneProvider->get($this->host));
|
||||
$parser = new Parser('UTC');
|
||||
|
||||
$output = $connection->readAll();
|
||||
if (isset($output[0])) {
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ class Share extends AbstractShare {
|
|||
$this->server = $server;
|
||||
$this->name = $name;
|
||||
$this->system = $system;
|
||||
$this->parser = new Parser($server->getTimeZone());
|
||||
$this->parser = new Parser('UTC');
|
||||
}
|
||||
|
||||
private function getAuthFileArgument(): string {
|
||||
|
|
|
|||
Loading…
Reference in a new issue