php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Code Issues Packages Projects Releases Wiki Activity
78,584 Commits 549 Branches 1,485 Tags
6f0ad9ea1229a166ec2bd13f28587e49ae43b2ee
Commit Graph

78584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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:
https://bitbucket.org/libgd/gd-libgd/commits/4b86e06937bc5ff116be969137f8da9d1a7869d5
 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
https://bitbucket.org/libgd/gd-libgd/commits/5b42b1178c37ffd30c9a15733058656be0277da0
 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
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
Christopher Jones 601367ee75 Fixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries) 2014-03-10 16:33:35 -07:00
Anatol Belski c946d7f086 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-03-10 17:52:51 +01:00
Anatol Belski dc87c208fd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
 2014-03-10 17:50:45 +01:00
Anatol Belski 73b3f58bcd updated libsqlite to 3.8.3.1 in 5.5 branch, too 2014-03-10 17:49:35 +01:00
Andrey Hristov 73f03a47d0 DI 2014-03-10 18:18:56 +02:00
Andrey Hristov 16043b261f Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-03-10 17:34:18 +02:00
Pierre Joye 8391277fb8 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
# By Anatol Belski
# Via Anatol Belski
* 'PHP-5.4' of git.php.net:php-src:
  updated libmagic.patch
 2014-03-10 16:31:09 +01:00
Pierre Joye a92240e209 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
# By Anatol Belski (1) and others
# Via Anatol Belski
* 'PHP-5.5' of git.php.net:php-src:
  updated libmagic.patch
  Fix indentation
  Do not remove *.1, it's not generated by make but configure
 2014-03-10 16:30:05 +01:00