php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 14:31:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
69,014 Commits 547 Branches 1,483 Tags
ab62ffa0a2467d8781aca65bd11dbfc034de7c64
Commit Graph

28836 Commits

Author SHA1 Message Date
Derick Rethans
ab62ffa0a2 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-14 09:38:32 +01:00
Derick Rethans
78354f30d9 - Updated to version 2012.6 (2012f) 2012-09-14 09:38:31 +01:00
Derick Rethans
bc602495d7 Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2012-08-24 10:56:03 +02:00
Derick Rethans
e5bfcd340a Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3 2012-08-24 10:55:17 +02:00
Xinchen Hui
13bcf685cb Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray) 2012-08-23 23:27:16 +08:00
Xinchen Hui
42f91d6ac6 Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray) 2012-08-23 23:21:25 +08:00
Anatoliy Belsky
9a72b52a1f fixing test for upcoming mpir upgrade 
- mpir is going to be upgraded up to 2.5.1 on windows
 2012-08-23 17:09:45 +02:00
Anatoliy Belsky
eca4fc6991 ZTS fix introduced by Felipe must also go into 5.3 2012-08-23 13:32:06 +02:00
Gustavo André dos Santos Lopes
d212a5d391 Fix SPOOFCHECKER_METHOD_FETCH_OBJECT definition 2012-08-23 10:32:05 +01:00
Felipe Pena
b98fc4379f - Fixed ZTS build 2012-08-22 19:39:57 -03:00
Gustavo Lopes
cd1f45b3be Fix handling of several uinitialized intl objects 
PHP 5.4 specific changes. Not having this in the merge commit helps
porting to pecl/intl
 2012-08-22 22:38:31 +02:00
Gustavo Lopes
87803ace94 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix handling of several uinitialized intl objects
 2012-08-22 22:37:52 +02:00
Gustavo Lopes
a5d0c1e21b Fix handling of several uinitialized intl objects 2012-08-22 22:32:51 +02:00
Felipe Pena
7a56ac00a0 - Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private) 2012-08-22 10:50:50 -03:00
Xinchen Hui
4e561055a4 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-22 13:49:04 +08:00
Xinchen Hui
e5bdd2c0ee Fixed bug #62885 (mysqli_poll - Segmentation fault) 2012-08-22 13:41:47 +08:00
Felipe Pena
b0dbf71466 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Removed PHP 6 checks
 2012-08-21 20:15:48 -03:00
Felipe Pena
85fa4d7747 - Removed PHP 6 checks 2012-08-21 20:15:34 -03:00
Xinchen Hui
cd34067aec skip test properly 2012-08-21 22:15:54 +08:00
Xinchen Hui
60ad16e11f skip test properly 2012-08-21 22:11:22 +08: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
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
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
8722173ad5 Implemented FR #62840 (Add sort flag to ArrayObject::ksort) 2012-08-21 13:32:15 +08: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 Adrian Marius
b9a050100c skip test for bug 43130 on firebird , not relevant 2012-08-20 16:56:37 +03: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
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
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
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
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
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
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
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
Xinchen Hui
0b23da1c74 Fixed bug #62836 (Seg fault or broken object references on unserialize()) 2012-08-17 18:28:32 +08: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
Antony Dovgal
b5494c5f17 Merge commit '8649e42' into PHP-5.4 
* commit '8649e42':
  Fixed bug #62838
 2012-08-16 14:34:32 +04:00