Commit Graph

79170 Commits

Author SHA1 Message Date
Remi Collet
87a87c6682 NEWS 2014-03-14 09:51:53 +01:00
Remi Collet
17f6391bf8 Fixed Bug #66833 Default digest algo is still MD5
Switch to SHA1, which match internal openssl hardcoded algo.

In most case, won't even be noticed
- priority on user input (default_md)
- fallback on system config
- fallback on this default value

Recent system reject MD5 digest, noticed in bug36732.phpt failure.

While SHA1 is better than MD5, SHA256 is recommenced,
and defined as default algo in provided configuration on
recent system (Fedora 21, RHEL-7, ...). But the idea is to
keep in sync with openssl internal value for PHP internal value.
2014-03-14 09:50:15 +01:00
David Zülke
db6c33875c Fix 5.5.10 NEWS
The FPM change didn't make it into 5.5.10 but will instead be in 5.5.11; http://php.net/Changelog-5.php, the release and the NEWS file in the release accurately reflect this, but the 5.5 branch NEWS doesn't (as the release was made and tagged from the last RC, which didn't contain that change yet).
2014-03-13 16:51:44 +01:00
Lior Kaplan
14731a7501 Merge branch 'PHP-5.6'
* PHP-5.6:
  Typo fix: sicret -> secret
2014-03-13 12:43:15 +02:00
Lior Kaplan
f120463efe Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Typo fix: sicret -> secret
2014-03-13 12:41:48 +02:00
Lior Kaplan
356c442558 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Typo fix: sicret -> secret
2014-03-13 12:40:14 +02:00
Michael Meyer
737c187013 Typo fix: sicret -> secret 2014-03-13 12:37:25 +02:00
Anatol Belski
21db15ed1d Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libs_version.txt
2014-03-13 10:31:26 +01:00
Anatol Belski
f0634b5be5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libs_version.txt

Conflicts:
	win32/build/libs_version.txt
2014-03-13 10:31:03 +01:00
Anatol Belski
f7b9c12ed9 updated libs_version.txt 2014-03-13 10:28:04 +01:00
Yasuo Ohgaki
ea72093259 Merge branch 'PHP-5.6'
* PHP-5.6:
  Remove unneeded test
2014-03-13 06:55:10 +09:00
Yasuo Ohgaki
973f379efc Remove unneeded test 2014-03-13 06:54:52 +09:00
Yasuo Ohgaki
96d25b4b76 Update NEWS 2014-03-13 06:34:46 +09:00
Yasuo Ohgaki
0021095c40 Merge branch 'PHP-5.6'
* PHP-5.6:
  Revert "Implement Bug #54649 Create session_serializer_name()"
  Revert "Implemented Request #11100 (session_gc() function)."
2014-03-13 06:33:28 +09:00
Yasuo Ohgaki
6f0ad9ea12 Revert "Implement Bug #54649 Create session_serializer_name()"
This reverts commit 678ec30655.

Conflicts:
	ext/session/tests/session_serializer_name_basic.phpt
2014-03-13 06:32:49 +09:00
Yasuo Ohgaki
7dec5789fe Revert "Implemented Request #11100 (session_gc() function)."
This reverts commit 54a42f0d0c.

Conflicts:
	ext/session/tests/session_gc_basic.phpt
2014-03-13 06:30:32 +09:00
Anatol Belski
f407482fcc Merge branch 'PHP-5.6'
* PHP-5.6:
  made libgd recognize the 9 version series
2014-03-12 19:31:21 +01:00
Anatol Belski
0bf5bce6ad Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  made libgd recognize the 9 version series
2014-03-12 19:31:07 +01:00
Anatol Belski
3f049bcff2 made libgd recognize the 9 version series 2014-03-12 19:30:27 +01:00
Anatol Belski
983e105d6b Merge branch 'PHP-5.6'
* PHP-5.6:
  fix include search
2014-03-12 19:25:44 +01:00
Anatol Belski
75486555c2 fix include search 2014-03-12 19:25:20 +01:00
Remi Collet
1db6ecc235 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image
2014-03-12 17:13:55 +01:00
Remi Collet
78cee12561 NEWS 2014-03-12 17:13:47 +01:00
Remi Collet
44c0581e0c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image
2014-03-12 17:13:31 +01:00
Remi Collet
495d5335f9 NEWS 2014-03-12 17:13:24 +01:00
Remi Collet
862c006da1 Fix bug #66887 imagescale - poor quality of scaled image
Issue with signed char overflow.

Upstream fix:
4b86e06937
2014-03-12 17:10:51 +01:00
Remi Collet
a498e64914 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  Fixed Bug #66893i imagescale ignore method argument
2014-03-12 15:36:52 +01:00
Remi Collet
4a1efa350a NEWS 2014-03-12 15:36:38 +01:00
Remi Collet
5bd13c5231 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed Bug #66893i imagescale ignore method argument
2014-03-12 15:36:08 +01:00
Remi Collet
f2d5b2b6c6 Fixed Bug #66893i imagescale ignore method argument
We also have our goto fail; bug.

Upstream fix for libgd
5b42b1178c
2014-03-12 15:35:42 +01:00
Nikita Popov
e2a5859b2f Merge branch 'PHP-5.6' 2014-03-12 14:17:27 +01:00
Nikita Popov
5e93a213f6 Add SKIPIF in GMP test 2014-03-12 14:17:08 +01:00
Nikita Popov
e617dfbdf3 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-12 14:16:58 +01:00
Nikita Popov
06bbb657ad Fix hash_pbkdf2() with missing $length argument
Also change the type of some string length variables to ensure
that the zpp call works correctly on platforms where sizeof(int)
!= sizeof(long).
2014-03-12 14:16:18 +01:00
Remi Collet
bc8095350d Merge branch 'PHP-5.6'
* PHP-5.6:
  typo in NEWS
  typo in NEWS
2014-03-12 14:08:36 +01:00
Remi Collet
0bccd48d3f typo in NEWS 2014-03-12 14:08:25 +01:00
Remi Collet
a912fb498e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  typo in NEWS
2014-03-12 14:08:09 +01:00
Remi Collet
68f318a422 typo in NEWS 2014-03-12 14:08:02 +01:00
Remi Collet
ee06def81b Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  Fixed Bug #66890 imagescale segfault
2014-03-12 13:47:36 +01:00
Remi Collet
081e2b9928 NEWS 2014-03-12 13:47:10 +01:00
Remi Collet
c8c1205d84 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fixed Bug #66890 imagescale segfault
2014-03-12 13:46:51 +01:00
Remi Collet
119821a452 NEWS 2014-03-12 13:46:29 +01:00
Remi Collet
dada2f550f Fixed Bug #66890 imagescale segfault
zend_parse_parameters "l" expect long, not int
2014-03-12 13:44:58 +01:00
Matteo Beccati
f35aba1874 Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated UPGRADING to cover PDO_pgsql changes
2014-03-12 12:32:25 +01:00
Matteo Beccati
f0da85b492 Updated UPGRADING to cover PDO_pgsql changes 2014-03-12 12:31:04 +01:00
Yasuo Ohgaki
ca927bb47e Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding 2014-03-12 17:54:22 +09:00
Matteo Beccati
f702bf3178 Merge branch 'PHP-5.6'
* PHP-5.6:
  Added new PDO::PGSQL_ATTR_DISABLE_PREPARES that uses PQexecParams
  Deprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT
  Drop PDO support for extremely old libpq versions
2014-03-11 23:30:18 +01:00
Matteo Beccati
1241a63931 Updated NEWS 2014-03-11 23:28:53 +01:00
Matteo Beccati
e378348a31 Added new PDO::PGSQL_ATTR_DISABLE_PREPARES that uses PQexecParams
Faster than prepared statements when queries are run once. Slightly
slower than PDO::ATTR_EMULATE_PREPARES but without the potential
security implications of embedding parameters in the query itself.
2014-03-11 23:10:48 +01:00
Matteo Beccati
d72621ab9e Deprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT 2014-03-11 23:10:48 +01:00