clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,692 Commits 494 Branches 1,367 Tags 801 MiB
62305edc5b
Commit Graph

78692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
75486555c2 fix include search 2014-03-12 19:25:20 +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
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
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
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
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
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
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
Matteo Beccati
b1ffea3ccc Drop PDO support for extremely old libpq versions 
configure will now fail if any of the following function is missing:
* PQprepare
* PQexecParams
* PQescapeStringConn
* PQescapeByteaConn
 2014-03-11 23:10:47 +01:00
Adam Harvey
1a14eb53c4 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-11 11:06:39 -07:00
Adam Harvey
f8252aa537 Fix compile error with theoretically supported versions of libcurl < 7.12.3. 2014-03-11 11:04:26 -07:00
Anatol Belski
adca4c355c fix path separator 2014-03-11 16:29:30 +01:00
Nikita Popov
fd5fbba98c Use /dev/urandom as the default mcrypt_create_iv() source 
Also fixes the ARGINFO for mcrypt_create_iv() and adds missing
UPGRADING entries.
 2014-03-11 14:06:13 +01:00
Nikita Popov
a117e6b937 Add tests for bug #66872 and gmp_[rem]root 2014-03-11 14:06:12 +01:00
Tjerk Meesters
03e9878c78 Fixed mcrypt test case 2014-03-11 20:49:41 +08:00
Tjerk Meesters
ffc0f8a16f Merge branch 'php-5.5' into PHP-5.6 2014-03-11 19:16:13 +08:00
Tjerk Meesters
cb5178a450 Merge branch 'PHP-5.4' into PHP-5.5 2014-03-11 19:14:43 +08:00
Tjerk Meesters
ddd7ed9b24 Removed bogus loops 2014-03-11 19:08:18 +08:00
Anatol Belski
54a18f3be6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  restored the old code in 5.4/5 related to bug #66872
 2014-03-11 11:53:17 +01:00
Anatol Belski
72050af855 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  restored the old code in 5.4/5 related to bug #66872
 2014-03-11 11:51:35 +01:00
Anatol Belski
1a624e27a6 restored the old code in 5.4/5 related to bug #66872 
The crash is reproducable in 5.6+ only, so 5.4 and 5.5 are fine
with the old code.
 2014-03-11 11:50:14 +01:00
Christopher Jones
f0ec533573 Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 
# By Pierre Joye (7) and others
# Via Pierre Joye (10) and others
* 'PHP-5.6' of https://git.php.net/repository/php-src:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
  DI
  Switch from a single flag to a flag byte
  update NEWS
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  add vc12 (2013)
  add vc12 (2013)
 2014-03-10 16:46:42 -07:00
Christopher Jones
3a8282ed0f Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
# By Pierre Joye (7) and Anatol Belski (1)
# Via Pierre Joye (7) and Anatol Belski (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
  update NEWS
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  add vc12 (2013)
  add vc12 (2013)
 2014-03-10 16:46:40 -07:00
Christopher Jones
4dc8610d34 Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
# By Pierre Joye
# Via Pierre Joye
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  add vc12 (2013)
 2014-03-10 16:46:39 -07:00