clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 15:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,842 Commits 494 Branches 1,367 Tags 813 MiB
875df12c0b
Commit Graph

74842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
875df12c0b Merge branch 'PHP-5.5' 2013-06-17 13:25:04 +08:00
Xinchen Hui
aa2369f85a Merge branch 'PHP-5.4' into PHP-5.5 2013-06-17 13:23:24 +08:00
Xinchen Hui
cfb1ffb4fa Fix typo in test 2013-06-17 13:22:20 +08:00
Stanislav Malyshev
dea16af29a Merge branch 'PHP-5.5' 
* PHP-5.5:
  Identation Fixed
  Identation Fixed
 2013-06-16 18:14:32 -07:00
Stanislav Malyshev
9bfb28c793 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Identation Fixed
 2013-06-16 18:14:16 -07:00
Jefersson Nathan
ebef8c4176 Identation Fixed 2013-06-16 18:13:49 -07:00
Stanislav Malyshev
59280d910a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Identation Fixed
 2013-06-16 18:13:26 -07:00
Jefersson Nathan
1498b8260b Identation Fixed 2013-06-16 18:13:14 -07:00
Stanislav Malyshev
8b3d31c1c3 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #64764: Add status option to fpm init.d script
 2013-06-16 16:56:38 -07:00
Stanislav Malyshev
a770ae36c2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64764: Add status option to fpm init.d script
 2013-06-16 16:56:29 -07:00
Lior Kaplan
ee01af7df1 Fix bug #64764: Add status option to fpm init.d script 2013-06-16 16:54:49 -07:00
Stanislav Malyshev
7978e44f08 Merge branch 'PHP-5.5' 
* PHP-5.5:
  update NEWS
 2013-06-16 16:41:37 -07:00
Stanislav Malyshev
44822a7166 update NEWS 2013-06-16 16:41:23 -07:00
Stanislav Malyshev
97c56e1eb1 Merge branch 'PHP-5.5' 
* PHP-5.5:
  news for #64166
 2013-06-16 16:40:56 -07:00
Stanislav Malyshev
d44daff4d0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  news for #64166
 2013-06-16 16:40:52 -07:00
Stanislav Malyshev
2a93fd1347 news for #64166 2013-06-16 16:40:39 -07:00
Stanislav Malyshev
e3cd0d1417 Merge branch 'PHP-5.5' 
* PHP-5.5:
  add more tests for bug #64166
  Move unsigned char declaration to top of block
  trailing ws
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
 2013-06-16 16:39:06 -07:00
Stanislav Malyshev
7d1fef15cf Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add more tests for bug #64166
  Move unsigned char declaration to top of block
  trailing ws
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
 2013-06-16 16:38:49 -07:00
Stanislav Malyshev
7bb052ee3e add more tests for bug #64166 2013-06-16 16:34:34 -07:00
Michael M Slusarz
0dc98208ee Move unsigned char declaration to top of block 2013-06-16 16:04:29 -07:00
Michael M Slusarz
d9c034ee5e trailing ws 2013-06-16 16:04:24 -07:00
Michael M Slusarz
b5b0a53b09 Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace 
Second attempt: need to use lookaheadto determine whether to encode ws
 2013-06-16 16:04:19 -07:00
Michael M Slusarz
600d6deef9 Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace 
If trailing whitespace on a line is detected, mark the linebreak as a
soft linebreak.
 2013-06-16 16:04:14 -07:00
Stanislav Malyshev
6db7e31fa6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #64936 - clean doc comment state at the beginning and end of the scan
  ws fix
 2013-06-16 15:30:44 -07:00
Stanislav Malyshev
ac343d5c1f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64936 - clean doc comment state at the beginning and end of the scan
  ws fix

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner.l
	Zend/zend_language_scanner_defs.h
 2013-06-16 15:29:25 -07:00
Stanislav Malyshev
2208447d42 Fix bug #64936 - clean doc comment state at the beginning and end of the scan 2013-06-16 15:22:23 -07:00
Stanislav Malyshev
088c183639 ws fix 2013-06-16 15:22:23 -07:00
Anatol Belski
fd706595d4 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix test
 2013-06-17 00:11:05 +02:00
Anatol Belski
3625b83aaa Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test
 2013-06-17 00:10:32 +02:00
Anatol Belski
b6dd1ec60d fix test 
breach introduced in ac40c0b562
 2013-06-17 00:09:05 +02:00
Xinchen Hui
0842d5c06e Merge branch 'PHP-5.5' 2013-06-16 22:57:01 +08:00
Xinchen Hui
e3e4ec3f55 Update NEWS 2013-06-16 22:56:47 +08:00
Xinchen Hui
6cd6349ff8 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-16 22:56:22 +08:00
Xinchen Hui
49e57a3165 Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db server) 2013-06-16 22:55:59 +08:00
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