Commit Graph

2177 Commits

Author SHA1 Message Date
Andreas Fischer
7f1dfba50d Merge pull request #730 from terrafrost/disable-stat-cache-1.0
SFTP: don't update stat cache when it's been disabled

* terrafrost/disable-stat-cache-1.0:
  SFTP: don't update stat cache when it's been disabled
2015-07-06 23:48:28 +02:00
Andreas Fischer
c605f6a6dd Merge branch '2.0'
* 2.0:
  Scrutinizer CI: Unconfigure external code coverage. This keeps timing out.
2015-07-06 23:44:33 +02:00
Andreas Fischer
4114e06b1b Merge branch '1.0' into 2.0
* 1.0:
  Scrutinizer CI: Unconfigure external code coverage. This keeps timing out.
2015-07-06 23:44:33 +02:00
Andreas Fischer
cd2ecfa0d7 Merge pull request #728 from bantu/scrutinizer-coverage-disable
Scrutinizer CI: Unconfigure external code coverage. This keeps timing out.

* bantu/scrutinizer-coverage-disable:
  Scrutinizer CI: Unconfigure external code coverage. This keeps timing out.
2015-07-06 23:44:33 +02:00
Andreas Fischer
2f84747e19 Merge branch '2.0'
* 2.0:
  SFTP: update how recursive delete's update stat cache
  Tests/SFTP: add unit test
2015-07-06 23:38:30 +02:00
Andreas Fischer
83cac3385b Merge branch '1.0' into 2.0
* 1.0:
  SFTP: update how recursive delete's update stat cache
  Tests/SFTP: add unit test
2015-07-06 23:38:10 +02:00
Andreas Fischer
643103449c Merge pull request #731 from terrafrost/sftp-recur-delete-stat-cache-1.0
SFTP: delete stat cache for recursive deletes / 1.0 branch

* terrafrost/sftp-recur-delete-stat-cache-1.0:
  SFTP: update how recursive delete's update stat cache
  Tests/SFTP: add unit test
2015-07-06 23:37:55 +02:00
terrafrost
c460e511a0 SFTP: update how recursive delete's update stat cache 2015-07-04 13:09:26 -05:00
terrafrost
52aeb2ea3f Tests/SFTP: add unit test 2015-07-04 12:57:50 -05:00
terrafrost
109ae38e48 SFTP: don't update stat cache when it's been disabled 2015-07-04 12:19:35 -05:00
Andreas Fischer
8622f99a4f Merge branch '2.0'
* 2.0:
  Explicitly set size to 0 when creating or truncating.
  mode[0] of 'c' is not supposed to truncate.
  Need to create the file when it does not exist and mode[0] is not 'r'.
  Add SFTPStreamTest::testFopenFcloseCreatesFile()
2015-07-04 14:28:22 +02:00
Andreas Fischer
ac91bcabdd Merge branch '1.0' into 2.0
* 1.0:
2015-07-04 14:28:17 +02:00
Andreas Fischer
4724249f50 Merge pull request #727 from bantu/SFTPStreamTest-2.0
[2.0] Various fixes to fopen mode handling in SFTP Stream

* bantu/SFTPStreamTest-2.0:
  Explicitly set size to 0 when creating or truncating.
  mode[0] of 'c' is not supposed to truncate.
  Need to create the file when it does not exist and mode[0] is not 'r'.
  Add SFTPStreamTest::testFopenFcloseCreatesFile()
2015-07-04 14:28:15 +02:00
Andreas Fischer
727677d4e1 Merge pull request #713 from bantu/SFTPStreamTest
[1.0] Various fixes to fopen mode handling in SFTP Stream

* bantu/SFTPStreamTest:
  Explicitly set size to 0 when creating or truncating.
  mode[0] of 'c' is not supposed to truncate.
  Need to create the file when it does not exist and mode[0] is not 'r'.
  Add SFTPStreamTest::testFopenFcloseCreatesFile()
2015-07-04 14:28:06 +02:00
Andreas Fischer
5a3315ad54 Scrutinizer CI: Unconfigure external code coverage. This keeps timing out. 2015-07-04 02:04:21 +02:00
Andreas Fischer
ba46db1758 Merge pull request #713 from bantu/SFTPStreamTest
Various fixes to fopen mode handling in SFTP Stream

* bantu/SFTPStreamTest:
  Explicitly set size to 0 when creating or truncating.
  mode[0] of 'c' is not supposed to truncate.
  Need to create the file when it does not exist and mode[0] is not 'r'.
  Add SFTPStreamTest::testFopenFcloseCreatesFile()

Conflicts:
	tests/Functional/Net/SFTPLargeFileTest.php
2015-07-04 01:18:19 +02:00
Andreas Fischer
8cad45cd6b Merge branch '2.0'
* 2.0:
  X509: set one more parameter to null
  X509: set another parameters field to null
2015-06-30 12:27:06 +02:00
Andreas Fischer
483c253879 Merge branch '1.0' into 2.0
* 1.0:
  X509: set one more parameter to null
  X509: set another parameters field to null
2015-06-30 12:27:06 +02:00
Andreas Fischer
61af2be8f9 Merge pull request #723 from terrafrost/x509-null-1.0
set signaturealgorithm parameters field to null / 1.0 branch

* terrafrost/x509-null-1.0:
  X509: set one more parameter to null
  X509: set another parameters field to null
2015-06-30 12:27:05 +02:00
terrafrost
77c757d095 X509: set one more parameter to null 2015-06-29 22:10:18 -05:00
terrafrost
6c2798be90 X509: set another parameters field to null 2015-06-29 21:53:27 -05:00
Andreas Fischer
53a46ca6fa Merge branch '2.0'
* 2.0:
  Tests/X509: CS adjustments
  Tests/X509: typo
  X509: set parameter field to null for RSA keys
2015-06-29 10:31:39 +02:00
Andreas Fischer
28fc06e2cc Merge branch '1.0' into 2.0
* 1.0:
2015-06-29 10:31:34 +02:00
Andreas Fischer
15fecbd7ef Merge pull request #722 from terrafrost/x509-rsa-null-2.0-2
parameter field should be null for RSA keys in X509 certs / fix for 2.0 branch

* terrafrost/x509-rsa-null-2.0-2:
  Tests/X509: CS adjustments
  Tests/X509: typo
  X509: set parameter field to null for RSA keys
2015-06-29 10:31:06 +02:00
Andreas Fischer
e0690f6b23 Merge pull request #721 from terrafrost/x509-rsa-null-1.0
parameter field should be null for RSA keys in X509 certs / fix for 1.0 branch

* terrafrost/x509-rsa-null-1.0:
  Tests/X509: CS adjustments
  Tests/X509: typo
  X509: set parameter field to null for RSA keys
2015-06-29 10:30:56 +02:00
terrafrost
815f443ed1 Merge branch 'x509-rsa-null-1.0' into x509-rsa-null-2.0-2
Conflicts:
	tests/Unit/File/X509/X509Test.php
2015-06-28 16:10:40 -05:00
terrafrost
2c8cb0b426 Tests/X509: CS adjustments 2015-06-28 14:52:07 -05:00
terrafrost
2277c0fbac Tests/X509: typo 2015-06-28 11:40:34 -05:00
terrafrost
46a3c0fbbb X509: set parameter field to null for RSA keys 2015-06-28 11:32:42 -05:00
Andreas Fischer
1119e4ad91 Merge branch '2.0'
* 2.0:
  Tests/SFTP: $lstat->$stat
  Tests/SFTP: just check to see that stat / lstat return an array
  SFTP: update conditions under which cache for lstat / . is used
  Tests/SFTP: add test for stat's on .
2015-06-27 21:59:45 +02:00
Andreas Fischer
e1dd7e9d69 Merge branch '1.0' into 2.0
* 1.0:
  Tests/SFTP: $lstat->$stat
  Tests/SFTP: just check to see that stat / lstat return an array
  SFTP: update conditions under which cache for lstat / . is used
  Tests/SFTP: add test for stat's on .
2015-06-27 21:59:45 +02:00
Andreas Fischer
1ad66ad1ea Merge pull request #719 from terrafrost/lstat-fix-1.0
SFTP: update conditions under which cache for lstat / . is used for 1.0 branch

* terrafrost/lstat-fix-1.0:
  Tests/SFTP: $lstat->$stat
  Tests/SFTP: just check to see that stat / lstat return an array
  SFTP: update conditions under which cache for lstat / . is used
  Tests/SFTP: add test for stat's on .
2015-06-27 21:59:45 +02:00
Andreas Fischer
8c290003cf Merge branch '2.0'
* 2.0:
  SSH2: fix for window sizes > 2,147,483,648
2015-06-27 21:58:45 +02:00
Andreas Fischer
89cf423c58 Merge branch '1.0' into 2.0
* 1.0:
  SSH2: fix for window sizes > 2,147,483,648
2015-06-27 21:58:45 +02:00
Andreas Fischer
e956acd851 Merge pull request #717 from terrafrost/neg_window_size_fix-1.0
SSH2: fix for window sizes > 2,147,483,648 for 1.0 branch

* terrafrost/neg_window_size_fix-1.0:
  SSH2: fix for window sizes > 2,147,483,648
2015-06-27 21:58:45 +02:00
terrafrost
fb3bd8adff Tests/SFTP: $lstat->$stat 2015-06-27 07:56:47 -05:00
terrafrost
df65acb999 Tests/SFTP: just check to see that stat / lstat return an array 2015-06-27 07:43:35 -05:00
terrafrost
d1d415618a SFTP: update conditions under which cache for lstat / . is used 2015-06-26 23:34:14 -05:00
terrafrost
26818ebb40 Tests/SFTP: add test for stat's on . 2015-06-26 22:25:22 -05:00
Andreas Fischer
c66d553835 Merge branch '2.0'
* 2.0:
  Increase the external_code_coverage timeout even more. Still timing out.
2015-06-25 14:34:21 +02:00
Andreas Fischer
a189767e75 Merge branch '1.0' into 2.0
* 1.0:
  Increase the external_code_coverage timeout even more. Still timing out.
2015-06-25 14:34:04 +02:00
Andreas Fischer
92a7f74d8a Merge pull request #715 from bantu/scrutinizer-timeout-3h
Increase the external_code_coverage timeout even more. Still timing out.

* bantu/scrutinizer-timeout-3h:
  Increase the external_code_coverage timeout even more. Still timing out.
2015-06-25 14:33:55 +02:00
Andreas Fischer
d71da6b02b Explicitly set size to 0 when creating or truncating. 2015-06-25 14:26:35 +02:00
Andreas Fischer
9e07fb704b mode[0] of 'c' is not supposed to truncate. 2015-06-25 14:24:58 +02:00
Andreas Fischer
f0957021a1 Need to create the file when it does not exist and mode[0] is not 'r'. 2015-06-25 14:24:18 +02:00
Andreas Fischer
01f547ba17 Add SFTPStreamTest::testFopenFcloseCreatesFile() 2015-06-25 14:05:18 +02:00
Andreas Fischer
acfaeb5ba6 Increase the external_code_coverage timeout even more. Still timing out. 2015-06-25 12:08:34 +02:00
terrafrost
c0555581e7 SSH2: fix for window sizes > 2,147,483,648 2015-06-24 23:45:14 -05:00
Andreas Fischer
d098568e4f Merge branch '2.0'
* 2.0:
  Unit/X509/CSR: looks like a line got overwritten..
  SFTP: stat cache updates
2015-06-22 01:19:33 +02:00
Andreas Fischer
0aa4cb174c Merge branch '1.0' into 2.0
* 1.0:
2015-06-22 01:19:28 +02:00