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,372 Commits 491 Branches 1,363 Tags 846 MiB
9ad748edfb
Commit Graph

71372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
94a1d0de2a Merge branch 'master' of git.php.net:php-src 2012-08-19 18:34:58 +08: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
Xinchen Hui
8b87c6df84 Update NEWS 2012-08-19 18:33:06 +08:00
Reeze Xia
46a3f25772 Fixed bug #62852 (Unserialize invalid DateTime causes crash) 2012-08-19 17:57:45 +08:00
Felipe Pena
b2a74b5bdb - Remove unused vars 2012-08-18 11:28:00 -03:00
Xinchen Hui
75cf51de50 Merge branch 'PHP-5.4' 2012-08-18 12:22:47 +08:00
Xinchen Hui
ebefbdb76d Fix test failed 2012-08-18 12:21:48 +08:00
Xinchen Hui
57e7c7bd49 tab 2012-08-18 11:57:53 +08:00
Xinchen Hui
72b9b8f380 Make the codes clearer, and also check continue statement 2012-08-18 11:44:09 +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
f2a8912e61 Refactor examing of jumping out of finally block 2012-08-18 00:16:34 +08:00
Adam Harvey
14847af41d Update version numbers to 5.4.7-dev. 2012-08-17 23:07:54 +08:00
Xinchen Hui
2449365238 Fixed context info in error message 2012-08-17 21:18:20 +08: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
Felipe Pena
f84947c688 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set)
 2012-08-16 15:45:40 -03:00
Felipe Pena
2e1d31d123 - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set) 2012-08-16 15:45:21 -03: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
Nikita Popov
fc26aa7f3e Adjust UPGRADING/NEWS for additional mcrypt deprecations 2012-08-16 17:10:05 +02:00
Nikita Popov
b2b02fcf92 Merge remote-tracking branch 'googleguy/mcrypt-deprecated-functions-tests' 2012-08-16 17:01:37 +02:00
Xinchen Hui
acd402d4e7 typo 2012-08-16 23:01:58 +08: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
Antony Dovgal
8649e4236b Fixed bug #62838 
enchant_dict_quick_check() destroys zval, but fails to initialize it
 2012-08-16 14:32:55 +04:00
Xinchen Hui
0312d0a262 Prevents goto out of a finally block 2012-08-16 18:17:26 +08:00
Nikita Popov
018395efaf Try to fix mysqli_field tests 
Those tests seem to fail when people have a different default collation, so
try to fix by specifying utf8_general_ci explicitely.
 2012-08-15 14:50:24 +02:00
Xinchen Hui
8f05350061 Merge branch 'master' of git.php.net:php-src 2012-08-15 10:47:51 +08:00
Xinchen Hui
b7a5a8eb62 Merge branch 'fix-intl-tests' of https://github.com/reeze/php-src 2012-08-15 10:46:39 +08:00
Christopher Jones
c8359123ed Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix skipifs
 2012-08-14 14:13:19 -07:00