clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 07:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,060 Commits 494 Branches 1,367 Tags 810 MiB
c6a7549efc
Commit Graph

75060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Boris Lytochkin
3457096758 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix typo in test
 2013-06-16 00:10:06 +04:00
Boris Lytochkin
3dd2de3f45 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix typo in test
 2013-06-16 00:09:55 +04:00
Boris Lytochkin
7457867ba8 fix typo in test 2013-06-16 00:09:18 +04:00
Boris Lytochkin
6ab78c9fde Merge branch 'master' of https://git.php.net/push/php-src 
* 'master' of https://git.php.net/push/php-src: (171 commits)
  Fixed bug #63186 (compile failure on netbsd)
  fix test for bug #60322
  ensure the error_reporting level to get expected notice
  fixed tests
  missing tests for bug #53437
  fixed EOL
  added closing ?>
  fix double entry
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
  split the test for 32 and 64 bit
  typo fixes (argument)
  typo fixes (accommodate, parameter)
  missing colon
  Backported the fix for bug #53437
  Backported the fix for bug #53437
  fixed the test
  Fix a BC breach related to bug #53437
  Fixed bug #64988 (Class loading order affects E_STRICT warning)
  ...
 2013-06-16 00:04:22 +04:00
Boris Lytochkin
0741697107 Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/push/php-src: (147 commits)
  Fixed bug #63186 (compile failure on netbsd)
  fix test for bug #60322
  ensure the error_reporting level to get expected notice
  fixed tests
  missing tests for bug #53437
  fixed EOL
  added closing ?>
  fix double entry
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
  split the test for 32 and 64 bit
  typo fixes (argument)
  typo fixes (accommodate, parameter)
  missing colon
  Backported the fix for bug #53437
  Backported the fix for bug #53437
  fixed the test
  Fix a BC breach related to bug #53437
  Fixed bug #64988 (Class loading order affects E_STRICT warning)
  ...
 2013-06-16 00:04:00 +04:00
Boris Lytochkin
8acfa0b3f8 Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/push/php-src: (76 commits)
  Fixed bug #63186 (compile failure on netbsd)
  fix test for bug #60322
  ensure the error_reporting level to get expected notice
  fixed tests
  missing tests for bug #53437
  fix double entry
  Merge branch 'pull-request/341'
  typo fixes (argument)
  typo fixes (accommodate, parameter)
  missing colon
  Backported the fix for bug #53437
  Backported the fix for bug #53437
  Fixed bug #64988 (Class loading order affects E_STRICT warning)
  Fixed test script
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
  Fix spelling and correct typo.
  Callback has to be restored in MSHUTDOWN
  Update NEWs
  Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
  Fixed merge wrongly
  ...
 2013-06-16 00:03:30 +04:00
Matteo Beccati
55656d616c Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #63186 (compile failure on netbsd)
 2013-06-14 16:56:04 +02:00
Matteo Beccati
6f594514b0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #63186 (compile failure on netbsd)
 2013-06-14 16:55:12 +02:00
Matteo Beccati
02f552ceca Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63186 (compile failure on netbsd)
 2013-06-14 16:54:32 +02:00
Matteo Beccati
6238dd6f32 Fixed bug #63186 (compile failure on netbsd) 2013-06-14 16:51:54 +02:00
Stanislav Malyshev
3716599502 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix test for bug #60322
 2013-06-13 10:31:31 -07:00
Stanislav Malyshev
e74776266f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test for bug #60322
 2013-06-13 10:30:18 -07:00
Stanislav Malyshev
10b9579395 fix test for bug #60322 2013-06-13 10:30:00 -07:00
Anatol Belski
c1772cc3df Merge branch 'PHP-5.5' 
* PHP-5.5:
  ensure the error_reporting level to get expected notice
 2013-06-12 13:15:32 +02:00
Anatol Belski
a0cb61b292 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  ensure the error_reporting level to get expected notice
 2013-06-12 13:15:18 +02:00
Anatol Belski
ed2690477c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  ensure the error_reporting level to get expected notice
 2013-06-12 13:14:53 +02:00
Anatol Belski
cd1b44c4b6 ensure the error_reporting level to get expected notice 2013-06-12 13:13:48 +02:00
Anatol Belski
00ba7d416f Merge branch 'PHP-5.5' 
* PHP-5.5:
  fixed tests
 2013-06-11 12:40:30 +02:00
Anatol Belski
cb542d3c83 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed tests
 2013-06-11 12:39:50 +02:00
Anatol Belski
1cc750493f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fixed tests
 2013-06-11 12:39:28 +02:00
Anatol Belski
eccc05fc44 fixed tests 2013-06-11 12:38:49 +02:00
Anatol Belski
da094040fb Merge branch 'PHP-5.5' 
* PHP-5.5:
  missing tests for bug #53437
 2013-06-11 11:24:33 +02:00
Anatol Belski
7704e40d8f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  missing tests for bug #53437
 2013-06-11 11:24:16 +02:00
Anatol Belski
251ec84a97 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  missing tests for bug #53437
 2013-06-11 11:22:55 +02:00
Anatol Belski
f16143f5ac missing tests for bug #53437 2013-06-11 11:19:57 +02:00
Anatol Belski
8b74d46026 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fixed EOL
 2013-06-11 08:33:19 +02:00
Anatol Belski
bd4f6ad8a0 fixed EOL 2013-06-11 08:32:54 +02:00
Anatol Belski
c90e95baf6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  added closing ?>
 2013-06-11 08:26:07 +02:00
Anatol Belski
28e264db2a added closing ?> 2013-06-11 08:25:38 +02:00
Stanislav Malyshev
4e56ac50e5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix double entry
  Merge branch 'pull-request/341'
 2013-06-10 18:16:23 -07:00
Stanislav Malyshev
8acf9a4fe6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix double entry
  Merge branch 'pull-request/341'
 2013-06-10 18:16:09 -07:00
Stanislav Malyshev
760b7d00c3 fix double entry 2013-06-10 18:15:03 -07:00
Stanislav Malyshev
8ac131503d Merge branch 'PHP-5.5' 
* PHP-5.5:
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
 2013-06-10 14:31:57 -07:00
Stanislav Malyshev
4427d1dcfd Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Anatol Belski
d7c943e2a1 Merge branch 'PHP-5.5' 
* PHP-5.5:
  split the test for 32 and 64 bit
 2013-06-10 22:49:56 +02:00
Anatol Belski
ec79075394 split the test for 32 and 64 bit 2013-06-10 22:49:30 +02:00
Stanislav Malyshev
09bc6d7cf6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
 2013-06-10 13:37:56 -07:00
Stanislav Malyshev
84e35fb2e0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
 2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa typo fixes (argument) 2013-06-10 13:36:17 -07:00
Veres Lajos
ed2e84e239 typo fixes (accommodate, parameter) 2013-06-10 13:36:03 -07:00
Anatol Belski
00495d160b Merge branch 'PHP-5.5' 
* PHP-5.5:
  missing colon
 2013-06-10 19:55:51 +02:00
Anatol Belski
cf5b3fb166 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  missing colon
 2013-06-10 19:55:30 +02:00
Anatol Belski
7a1e670d76 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  missing colon
 2013-06-10 19:55:06 +02:00
Anatol Belski
18403e496d missing colon 2013-06-10 19:54:29 +02:00
Anatol Belski
464ad59a3b Merge branch 'PHP-5.5' 
* PHP-5.5:
  Backported the fix for bug #53437
  Backported the fix for bug #53437
 2013-06-10 19:53:27 +02:00
Anatol Belski
3a92c1beeb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Backported the fix for bug #53437
  Backported the fix for bug #53437
 2013-06-10 19:53:03 +02:00
Anatol Belski
0f9cf35315 Backported the fix for bug #53437 2013-06-10 19:52:29 +02:00
Anatol Belski
e1e07cb431 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Backported the fix for bug #53437
 2013-06-10 19:49:31 +02:00