clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,402 Commits 491 Branches 1,363 Tags 846 MiB
f8d9cabd11
Commit Graph

30301 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Felipe Pena
8c9e09313c Merge branch 'master' of git.php.net:php-src 2012-08-19 11:44:31 -03:00
Felipe Pena
2b685075b5 - Remove unused variable 2012-08-19 11:35:18 -03:00
Xinchen Hui
ca3c210f05 Merge branch 'PHP-5.4' 2012-08-19 18:34:17 +08:00
Xinchen Hui
8693bae624 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-19 18:33:37 +08:00
Reeze Xia
46a3f25772 Fixed bug #62852 (Unserialize invalid DateTime causes crash) 2012-08-19 17:57:45 +08:00
Anatoliy Belsky
7cf9ac1420 Merge branch 'PHP-5.4' 
* PHP-5.4:
  More intl tests extracted from symfony
  Update version numbers to 5.4.7-dev.

Conflicts:
	configure.in
	main/php_version.h
 2012-08-17 20:36:07 +02:00
Anatoliy Belsky
15e31d5720 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  More intl tests extracted from symfony
 2012-08-17 20:31:00 +02:00
Matt Ficken
1a23d42909 More intl tests extracted from symfony 2012-08-17 20:29:08 +02:00
Nikita Popov
294e7c295f Annother attempt at fixing the mysqli_fetch_field tests 
Instead of character set detection (which doesn't always work correctly)
fetch the character set info using mysqli_get_charset(). To make sure that
the returned info applies to all of client, connection and result
explicitely set utf8 as charset using mysqli_set_charset() before. I'm not
sure whether that last part is really necessary, but included it to be
safe.
 2012-08-17 19:47:59 +02:00
Xinchen Hui
3d93c88811 Merge branch 'PHP-5.4' 2012-08-17 18:30:03 +08:00
Xinchen Hui
0b23da1c74 Fixed bug #62836 (Seg fault or broken object references on unserialize()) 2012-08-17 18:28:32 +08:00
Nikita Popov
8cccc5c37d Revert "Try to fix mysqli_field tests" 
This reverts commit 018395efaf.

This change didn't really make sense in hindsight. Looking for some other
fix.
 2012-08-16 21:56:48 +02:00
Pierrick Charron
2118ab9ab4 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62839
 2012-08-16 14:51:28 -04:00
Pierrick Charron
8ac61a3e60 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62839
 2012-08-16 14:50:06 -04:00
Pierrick Charron
9cf0139460 Fixed bug #62839 
curl_copy_handle segfault with CURLOPT_FILE. The refcount was incremented
before the assignement.
 2012-08-16 14:48:44 -04:00
Nikita Popov
b5305d267b Fix curl_basic_022.phpt 
Some curl versions seem to have issues handling dates beyond
Thu, 31-Dec-2037 23:59:59 GMT (dates after this are just clamped to
MAX_INT).
 2012-08-16 19:08:46 +02:00
Nikita Popov
9a38bd66c8 Fix php_ini_loaded_file() test 
If running ./run-tests.php directly there isn't necessarily an ini file,
so the function can also return false.
 2012-08-16 17:46:34 +02:00
Sherif Ramadan
7014a0eb6d Fixed Mcrypt deprecated functions and related tests 2012-08-16 10:21:22 -04:00
Antony Dovgal
6a87a21c71 Merge commit '8649e42' 
* commit '8649e42':
  Fixed bug #62838
 2012-08-16 14:35:42 +04:00
Antony Dovgal
b5494c5f17 Merge commit '8649e42' into PHP-5.4 
* commit '8649e42':
  Fixed bug #62838
 2012-08-16 14:34:32 +04:00