This repository has been archived by the owner on Apr 28, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hotfix/3342' into develop
Forward port zendframework/zendframework#3342 Conflicts: library/Zend/File/Transfer/Adapter/AbstractAdapter.php library/Zend/File/Transfer/Adapter/Http.php library/Zend/File/Transfer/Transfer.php library/Zend/Http/Cookies.php library/Zend/Soap/Client.php library/Zend/Soap/Wsdl.php library/Zend/Stdlib/ErrorHandler.php library/Zend/Stdlib/Hydrator/ClassMethods.php library/Zend/Validator/File/Count.php library/Zend/Validator/File/Crc32.php library/Zend/Validator/File/ExcludeExtension.php library/Zend/Validator/File/ExcludeMimeType.php library/Zend/Validator/File/Exists.php library/Zend/Validator/File/Extension.php library/Zend/Validator/File/FilesSize.php library/Zend/Validator/File/Hash.php library/Zend/Validator/File/ImageSize.php library/Zend/Validator/File/Md5.php library/Zend/Validator/File/MimeType.php library/Zend/Validator/File/NotExists.php library/Zend/Validator/File/Sha1.php library/Zend/Validator/File/Size.php library/Zend/Validator/File/Upload.php library/Zend/Validator/File/WordCount.php tests/ZendTest/Validator/File/FilesSizeTest.php
- Loading branch information
123 parents
6102afa
+
978a0d2
+
f68efae
+
24315d0
+
90bab68
+
d5240ce
+
a4cf61f
+
737988b
+
24b691f
+
b2ba0b2
+
3df4d2a
+
d37df59
+
7f0c1ad
+
25ddb64
+
61dafd7
+
6eb1418
+
72e4c73
+
484fecb
+
17ed9ab
+
9881dbb
+
6d7f5ab
+
561ef2b
+
567588e
+
ec0d061
+
3a9c051
+
ffadf7b
+
8c8ab46
+
56dffee
+
9b3291e
+
72011a1
+
79d20ae
+
0023b68
+
203219a
+
51f1e65
+
adba36a
+
48704a6
+
3ed141c
+
a79cdbd
+
73871a0
+
47d468d
+
538d0f4
+
b5ad75a
+
2363c4f
+
91c2337
+
04dcb58
+
906c7b6
+
0da7bb6
+
0270a77
+
6784c86
+
90d950a
+
3b5ea7f
+
339830e
+
b04f4d5
+
8da9d32
+
0e2a882
+
f0829e4
+
c66d3bb
+
c44c042
+
e2121f5
+
19560b1
+
f08a210
+
294332a
+
3ab34f5
+
bb64c7d
+
b204532
+
1e8aff5
+
da2423f
+
7fce745
+
6c8026c
+
a449c92
+
c9f86d3
+
b2b0ea1
+
3b554ac
+
4deeef8
+
c6f5d24
+
fdaf0f2
+
6047973
+
66f79d5
+
ef273f8
+
6c44bc5
+
ddae1cc
+
fc0f217
+
05d994b
+
386083b
+
7890c16
+
07c51ae
+
a62d81b
+
53960c5
+
3521702
+
e2fdffd
+
160ad66
+
10bff24
+
944d975
+
71f09ad
+
03fbbc3
+
5d527bf
+
4281c0c
+
cc36360
+
b1dde09
+
e21037b
+
08b1d98
+
46b4569
+
b0e12bf
+
40d2cad
+
dcdecad
+
e693e44
+
ef8261e
+
d9444bc
+
1c0773a
+
e1a1f7a
+
7781996
+
1524272
+
7cec1e0
+
cf88eec
+
c11f566
+
e95ddeb
+
6f8f3b1
+
9a73c30
+
0351056
+
b5d005e
+
afdf14f
+
94358ed
+
95e7329
commit d702695
Showing
5 changed files
with
13 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters