clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,414 Commits 491 Branches 1,363 Tags 846 MiB
460d258e57
Commit Graph

71414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
460d258e57 Merge branch 'PHP-5.4' 2012-08-21 22:19:23 +08:00
Xinchen Hui
cd34067aec skip test properly 2012-08-21 22:15:54 +08:00
Xinchen Hui
3d4c9b7655 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-21 22:14:17 +08:00
Xinchen Hui
60ad16e11f skip test properly 2012-08-21 22:11:22 +08:00
Sebastian Bergmann
0fa40bb999 Bump version. 2012-08-21 13:37:18 +02:00
Anatoliy Belsky
47abbd1b4f Merge branch 'PHP-5.4' 
* PHP-5.4:
  Added test for bug #51353. It'll be skipped by default and must be activated manually.
  Bug 62462: adjusting test
 2012-08-21 13:27:52 +02:00
Anatoliy Belsky
d304527253 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Added test for bug #51353. It'll be skipped by default and must be activated manually.
 2012-08-21 13:24:54 +02:00
Anatoliy Belsky
92153dcfe3 Added test for bug #51353. It'll be skipped by default and must be 
activated manually.
 2012-08-21 13:22:00 +02:00
Lars Strojny
c4fecc1c5d Merge branch 'master' of git://github.com/php/php-src 2012-08-21 10:09:56 +02:00
Lars Strojny
7b6ebd97e7 Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4 2012-08-21 10:09:23 +02:00
Lars Strojny
aaa2eee4c0 Bug 62462: adjusting test 2012-08-21 10:09:05 +02:00
Lars Strojny
a45e81d093 Bug 62462: adjusting test 2012-08-21 10:08:46 +02:00
Xinchen Hui
f8d9cabd11 Merge branch 'PHP-5.4' 2012-08-21 15:23:53 +08:00
Xinchen Hui
c1284f21a7 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-21 15:23:09 +08:00
Reeze Xia
0cdc1f5626 Move test files to tests dir 
There are 7 files duplicated, so those files was deleted
 2012-08-21 14:32:39 +08:00
Xinchen Hui
546b0e4a99 Merge branch 'PHP-5.4' 2012-08-21 13:33:23 +08:00
Xinchen Hui
8722173ad5 Implemented FR #62840 (Add sort flag to ArrayObject::ksort) 2012-08-21 13:32:15 +08:00
Lars Strojny
18bb426587 Bug 62462: Prevent multibyte characters from being split between the lines 
Merged from https://github.com/php/php-src/pull/120
 2012-08-20 23:47:20 +02:00
Lars Strojny
c54d73d54c Bug 62462: Prevent multibyte characters from being split between the lines 
Merged from https://github.com/php/php-src/pull/120
 2012-08-20 23:46:50 +02:00
Xinchen Hui
ab4f3d93e8 Merge branch 'PHP-5.4' 2012-08-20 23:44:43 +08:00
Xinchen Hui
cc5631eca3 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-20 23:44:21 +08:00
Popa Marius Adrian
33d872d9f3 skip test for bug 43130 on firebird , not relevant 2012-08-20 17:25:56 +03:00
Popa Adrian Marius
b9a050100c skip test for bug 43130 on firebird , not relevant 2012-08-20 16:56:37 +03:00
Stanislav Malyshev
9ccf854198 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix for #62844
  relative-scheme
  bug #62844; relative URL schemes in parse_url()
 2012-08-19 22:20:30 -07:00
Stanislav Malyshev
12ea5c54e5 Fix for #62844 2012-08-19 22:19:57 -07:00
Andrew Faulds
4ec29b945c relative-scheme 2012-08-19 22:16:07 -07:00
Andrew Faulds
36b88d77f2 bug #62844; relative URL schemes in parse_url() 2012-08-19 22:15:58 -07:00
Stanislav Malyshev
591c59d9bf add heredoc parsing fix 2012-08-19 21:46:29 -07:00
Stanislav Malyshev
5ee3bf1647 add finally 2012-08-19 21:43:16 -07:00
Stanislav Malyshev
3336e1e78c Merge branch 'pull-request/31' 
* pull-request/31:
  Fix lexing of nested heredoc strings in token_get_all()
 2012-08-19 21:43:04 -07:00
Stanislav Malyshev
d2521fc42c Merge branch 'PHP-5.4' 
* PHP-5.4:
  update NEWS
 2012-08-19 20:40:52 -07:00
Stanislav Malyshev
675545f042 update NEWS 2012-08-19 20:37:44 -07:00
Felipe Pena
cd18e20101 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Value stored to var is never used
 2012-08-19 15:09:20 -03:00
Felipe Pena
13768f8650 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Value stored to var is never used
 2012-08-19 15:09:18 -03:00
Felipe Pena
f4054afe40 - Value stored to var is never used 2012-08-19 15:09:14 -03:00
Felipe Pena
64e4279642 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Value stored to var is never used
 2012-08-19 14:50:54 -03:00
Felipe Pena
d6e6db4501 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Value stored to var is never used
 2012-08-19 14:50:52 -03:00
Felipe Pena
3dd256a67b - Value stored to var is never used 2012-08-19 14:50:49 -03:00
Felipe Pena
01c3e0e62c Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Value stored to var is never used
 2012-08-19 14:34:46 -03:00
Felipe Pena
9d8d84ebdf Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Value stored to var is never used
 2012-08-19 14:34:42 -03:00
Felipe Pena
50ab6c63a7 - Value stored to var is never used 2012-08-19 14:34:38 -03:00
Felipe Pena
9ad748edfb Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Value stored to var is never used
 2012-08-19 12:55:46 -03:00
Felipe Pena
2497bb97e7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Value stored to var is never used
 2012-08-19 12:55:43 -03:00
Felipe Pena
6cd0e446dd - Value stored to var is never used 2012-08-19 12:55:38 -03:00
Felipe Pena
a025abe388 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Value stored to var is never used
 2012-08-19 12:44:54 -03:00
Felipe Pena
7a72405171 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Value stored to var is never used
 2012-08-19 12:44:49 -03:00
Felipe Pena
001966c754 - Value stored to var is never used 2012-08-19 12:44:44 -03:00
Felipe Pena
9899c077c5 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Value stored to var is never read
 2012-08-19 12:14:12 -03:00
Felipe Pena
6513ca85c2 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Value stored to var is never read
 2012-08-19 12:13:59 -03:00
Felipe Pena
dc1138b102 - Value stored to var is never read 2012-08-19 12:13:48 -03:00