clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 03:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
87,232 Commits 493 Branches 1,366 Tags 848 MiB
d51fb69c01
Commit Graph

87232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
411980a8bc Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-05 22:21:56 +08:00
Xinchen Hui
faa4171507 Add test script and use efree_size 2015-01-05 22:21:37 +08:00
Xinchen Hui
40230eef81 Revert "Revert "Fix memory leak when dereferencing reference with refcount 1"" 
This reverts commit 7aab9659ee.
 2015-01-05 22:13:22 +08:00
Matteo Beccati
a51de2168d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Update test after fixing bug #68371
 2015-01-05 12:12:02 +01:00
Matteo Beccati
38f1b569c2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update test after fixing bug #68371
 2015-01-05 12:11:46 +01:00
Matteo Beccati
ea1c0c5627 Update test after fixing bug #68371 2015-01-05 12:11:16 +01:00
Matteo Beccati
28ff513115 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS for #68371
  Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES
 2015-01-05 11:03:50 +01:00
Matteo Beccati
e372e037dd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS for #68371
 2015-01-05 11:03:31 +01:00
Matteo Beccati
4a9ad2faff Updated NEWS for #68371 2015-01-05 11:01:54 +01:00
Matteo Beccati
3de6f80ff5 Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES 2015-01-05 11:00:11 +01:00
Matteo Beccati
7d0887a229 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
 2015-01-05 10:48:40 +01:00
Matteo Beccati
488d3dac2e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
 2015-01-05 10:48:18 +01:00
Matteo Beccati
7d2f8525d8 Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names 2015-01-05 09:25:48 +01:00
Xinchen Hui
c234ca8e17 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-05 00:26:33 -05:00
Xinchen Hui
7aab9659ee Revert "Fix memory leak when dereferencing reference with refcount 1" 
This reverts commit f4cb5cc09d.

breaks tests Zend/tests/bug27268.phpt and Zend/tests/bug68262.phpt
 2015-01-05 00:26:10 -05:00
Stanislav Malyshev
d780334964 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix memory leak
 2015-01-04 21:08:24 -08:00
Stanislav Malyshev
95183cc339 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix memory leak
 2015-01-04 21:08:16 -08:00
Stanislav Malyshev
184b6d9e73 fix memory leak 2015-01-04 21:07:57 -08:00
Stanislav Malyshev
e6e0b51db9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixes #66764 -  configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
 2015-01-04 20:55:25 -08:00
Stanislav Malyshev
ec550cd783 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixes #66764 -  configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
 2015-01-04 20:55:17 -08:00
Stanislav Malyshev
eeae4651f7 Merge branch 'pull-request/975' into PHP-5.5 
* pull-request/975:
  Fixes #66764 -  configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
 2015-01-04 20:54:29 -08:00
Stanislav Malyshev
75e042e57a Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix GD tests with no GD loaded
  Fixed typo
  GD: imagepalettetotruecolor tests
 2015-01-04 19:57:46 -08:00
Stanislav Malyshev
97f894e189 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix GD tests with no GD loaded
  Fixed typo
  GD: imagepalettetotruecolor tests
 2015-01-04 19:57:29 -08:00
Stanislav Malyshev
5639c3350e Merge branch 'pull-request/742' into PHP-5.5 
* pull-request/742:
  Fixed typo
  GD: imagepalettetotruecolor tests
 2015-01-04 19:47:54 -08:00
Stanislav Malyshev
75f93ed663 fix GD tests with no GD loaded 2015-01-04 19:45:57 -08:00
Gustavo Frederico Temple Pedrosa
f5e22d06c3 Specifying MACRO for ppc64 
Add PowerPC64 too, which is capable to access unaligned words.
 2015-01-04 19:24:41 -08:00
Chris Christoff
1ec26346bb Formatting fixes for git rules file 
Formatting fixes for git rules file

This commit fixes 2 issues with the git rules
file. First, a typo of "::" has been changed to
":". Second, an extraneous space has been
removed.
 2015-01-04 19:24:41 -08:00
Xinchen Hui
28985e982b Still -1 on *BSD now 2015-01-04 22:08:35 -05:00
Xinchen Hui
80c0a02286 This is 511 now (ebf4ffc935) 2015-01-04 22:04:32 -05:00
Stanislav Malyshev
73d74ac54c Merge branch 'pull-request/731' 
* pull-request/731:
  Set FPM_BACKLOG_DEFAULT to 511
 2015-01-04 19:00:05 -08:00
Bob Weinand
f4cb5cc09d Fix memory leak when dereferencing reference with refcount 1 2015-01-05 00:28:53 +01:00
Nikita Popov
2269b1801d Add missing string cast for non-cv var fetches 2015-01-04 18:07:44 +01:00
Nikita Popov
69a4b135f3 Fix use after free for variables with integer names 2015-01-04 17:57:23 +01:00
Anatol Belski
4d6fb5e684 updated libmagic.patch 2015-01-04 17:09:06 +01:00
Anatol Belski
85bdb21b6e Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated libmagic.patch in 5.6
  updated libmagic.patch in 5.5
  updated libmagic.patch in 5.4
 2015-01-04 17:08:15 +01:00
Anatol Belski
03ae6f22b6 updated libmagic.patch in 5.6 2015-01-04 17:07:32 +01:00
Anatol Belski
d104f2ea88 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated libmagic.patch in 5.5
  updated libmagic.patch in 5.4
 2015-01-04 17:06:15 +01:00
Anatol Belski
4ed261870f updated libmagic.patch in 5.5 2015-01-04 17:05:42 +01:00
Anatol Belski
c772261319 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch in 5.4
 2015-01-04 17:04:53 +01:00
Anatol Belski
ebb98e7aeb updated libmagic.patch in 5.4 2015-01-04 17:04:13 +01:00
Anatol Belski
723319813b Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #68735 fileinfo out-of-bounds memory access
 2015-01-04 14:25:28 +01:00
Anatol Belski
5c0f03275e updated NEWS 2015-01-04 14:24:59 +01:00
Anatol Belski
28e44f9d44 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fixed bug #68735 fileinfo out-of-bounds memory access
 2015-01-04 14:23:56 +01:00
Anatol Belski
d3f171117c updated NEWS 2015-01-04 14:23:33 +01:00
Anatol Belski
5fe54dbaf9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #68735 fileinfo out-of-bounds memory access
 2015-01-04 14:22:37 +01:00
Anatol Belski
ede59c8feb Fixed bug #68735 fileinfo out-of-bounds memory access 2015-01-04 14:20:21 +01:00
Anatol Belski
f6abcd981f Merge branch 'PHP-5.6' 
* PHP-5.6:
  removed dead code
 2015-01-04 09:43:33 +01:00
Anatol Belski
c06f66563a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  removed dead code

Conflicts:
	ext/fileinfo/libmagic/readelf.c
	ext/fileinfo/libmagic/readelf.h
 2015-01-04 09:42:46 +01:00
Anatol Belski
b644dcfb72 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  removed dead code
 2015-01-04 09:40:56 +01:00
Remi Collet
919abf0cb1 removed dead code 2015-01-04 09:40:19 +01:00