clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,827 Commits 494 Branches 1,367 Tags 807 MiB
f3f824823d
Commit Graph

68827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatoliy Belsky
e793539678 sync zip ext version with pecl 2012-06-19 17:15:56 +02:00
Anatoliy Belsky
5c001d42d4 one more correction for COM upgrading notes 2012-06-19 14:58:06 +02:00
Anatoliy Belsky
df138c5719 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  one more correction for COM upgrading notes
 2012-06-19 14:51:52 +02:00
Anatoliy Belsky
f072662621 one more correction for COM upgrading notes 2012-06-19 14:42:59 +02:00
Anatoliy Belsky
0a65b661e4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  split gzgetc_basic.phpt for zlib 1.2.7
 2012-06-19 14:12:54 +02:00
Anatoliy Belsky
a8948d0808 split gzgetc_basic.phpt for zlib 1.2.7 2012-06-19 14:08:34 +02:00
Anatoliy Belsky
d8ba49a2c7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  com ext upgrading correction
 2012-06-18 22:08:44 +02:00
Anatoliy Belsky
592917f91f com ext upgrading correction 2012-06-18 22:07:19 +02:00
Anatoliy Belsky
1c4e48650c com ext upgrading infos 2012-06-18 22:04:40 +02:00
Anatoliy Belsky
b408028b88 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  com ext upgrading info
 2012-06-18 21:59:27 +02:00
Anatoliy Belsky
6176b96a23 com ext upgrading info 2012-06-18 21:56:17 +02:00
Anatoliy Belsky
c56ff2bf75 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Reverted the BC fix regarding to #57905, test adopted
 2012-06-17 16:10:56 +02:00
Anatoliy Belsky
d3780f1f90 Reverted the BC fix regarding to #57905, test adopted 
New 0.10.1 has a stronger archive integrity check. Restoring
the old behaviour of libzip < 0.10.1 makes no sense at this
place.
 2012-06-17 16:04:36 +02:00
stealth35
11a202ef50 Fix potential leak in cli server 2012-06-16 00:56:54 +03:00
Anatoliy Belsky
280e3a4ec8 Fixed bug #62312 ext\sockets\tests\socket_import_stream-4.phpt fails 2012-06-14 18:02:53 +02:00
Anatoliy Belsky
3faebe2bec Fix bug #62270 Test bug - ext/fileinfo/tests/finfo_open_error-win32 2012-06-14 17:59:39 +02:00
Johannes Schlüter
fef691b142 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Merge PHP 5.3.14 NEWS
  re-add 61755 to NEWS
 2012-06-13 10:36:49 +02:00
Johannes Schlüter
26cb570615 Merge PHP 5.3.14 NEWS 2012-06-13 10:35:58 +02:00
Stanislav Malyshev
79e44c394f re-add 61755 to NEWS 2012-06-12 11:53:24 -07:00
Stanislav Malyshev
f0d6059389 re-add 61755 to NEWS 2012-06-12 11:52:22 -07:00
Stanislav Malyshev
c7be96b08f Revert "Add PBKDF2 support via openssl()" 
This reverts commit b5b8ea1050.
Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
 2012-06-12 11:22:49 -07:00
Stanislav Malyshev
a2bfad051d Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell." 
This reverts commit bccd1e672f.
Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
 2012-06-12 11:21:54 -07:00
Stanislav Malyshev
f8cc363841 add CVE 2012-06-12 11:19:08 -07:00
Scott MacVicar
bccd1e672f Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell. 
Summary:
Stas pointed out that this is named pretty poorly. Go for openssl_pbkdf2()
 2012-06-11 15:41:41 -07:00
Scott MacVicar
b5b8ea1050 Add PBKDF2 support via openssl() 
Summary:
No easy way to put these in the hash extension since we don't really support optional
parameters to certain algorithms. Implemented in openssl for now since it has it already
and is pretty stable.

Only SHA1 is confirmed to work as an algorithm but openssl has a parameter so it can be
changed in the future.

Will backport to 5.4 potentially with Stas' approval.

Test Plan:
Ran newly added tests which came from RFC 6070
 2012-06-11 13:35:25 -07:00
Matt Ficken
a18cede1c5 Fix bug #62271 test bug - ext/wddx/tests/bug48562.phpt 2012-06-11 17:00:36 +02:00
Stanislav Malyshev
b55e69285b typo fix 2012-06-10 20:38:22 -07:00
David Soria Parra
51a5e98af6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Make travis silent
 2012-06-10 18:17:49 +04:00
David Soria Parra
f464ffd780 Make travis silent 
Travis will always build all branches. As we just have a .travis.yml
on master, travis will go ahead and checkout PHP-5.3. It fails and
then sends mails. We really don't want to get spammed, so we add
a .travis.yml that is just silent.
 2012-06-10 18:17:37 +04:00
David Soria Parra
b9babd22e0 Merge branch 'PHP-5.3' into PHP-5.4 
By Stanislav Malyshev (1) and michelangelo (1)
* PHP-5.3:
  Adding a test for ext/posix/tests/posix_getegid_basic.phpt
  typo
 2012-06-10 17:08:02 +04:00
michelangelo
cda14b995c Adding a test for ext/posix/tests/posix_getegid_basic.phpt 2012-06-10 17:07:49 +04:00
Gustavo André dos Santos Lopes
503358c179 Fix bug #62266 
Custom extension segfaults during xmlParseFile with FPM SAPI
because the regular list is not prepared during the MINIT phase
and our custom external entity loader tries to open PHP streams.
 2012-06-09 17:29:47 +01:00
Stanislav Malyshev
c4cc43169c rearrange news 2012-06-08 13:27:24 -07:00
Stanislav Malyshev
ba8333cdb0 typo 2012-06-08 12:23:51 -07:00
Pierrick Charron
c467e81c86 NEWS File 2012-06-08 18:02:49 +02:00
Stanislav Malyshev
17c0ff1194 typo 2012-06-08 01:24:49 -07:00
Stanislav Malyshev
59eaa7c877 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  improve overflow checks
  fix potential overflow in _php_stream_scandir
 2012-06-08 01:22:46 -07:00
Stanislav Malyshev
fc74503792 improve overflow checks 2012-06-08 01:21:37 -07:00
Stanislav Malyshev
0e3a650e74 add NEWS 2012-06-07 23:11:28 -07:00
Stanislav Malyshev
10e8da1738 fix potential overflow in _php_stream_scandir 2012-06-07 23:09:18 -07:00
Stanislav Malyshev
7d04e0fb2e fix potential overflow in _php_stream_scandir 2012-06-07 23:08:35 -07:00
Anatoliy Belsky
d24d5b62c1 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  set current versions for libzip and zip ext
 2012-06-07 22:37:32 +02:00
Anatoliy Belsky
baacc2cb13 set current versions for libzip and zip ext 2012-06-07 22:32:03 +02:00
Anatoliy Belsky
7907dc4d66 updated NEWS 2012-06-07 21:45:30 +02:00
Anatoliy Belsky
d206206c10 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  updated NEWS
 2012-06-07 21:44:08 +02:00
Anatoliy Belsky
9ecb67d5a4 updated NEWS 2012-06-07 21:43:07 +02:00
Anatoliy Belsky
5ebdc46aa0 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  zip windows fixes
  fixed bc break related to #57905
  fixed a bit overlooked from the last libzip port
  brought the fix for #47667 back
  fixed zip entry freeing
  rechecked the merged libzip, took also the indents from the original to avoid confusion next time
  fixed a double freeing crash
  fixed header include
  initial libzip upgrade patch to 0.10.1
  - BFN

Conflicts:
	NEWS
 2012-06-07 21:06:31 +02:00
Anatoliy Belsky
bde0e8c2a1 zip windows fixes 2012-06-07 21:01:32 +02:00
Anatoliy Belsky
8ca457f64d fixed bc break related to #57905 2012-06-07 21:01:32 +02:00
Anatoliy Belsky
e883892664 fixed a bit overlooked from the last libzip port 2012-06-07 21:01:32 +02:00