mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-12 22:14:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
69,036 Commits 505 Branches 1,389 Tags 863 MiB
863e7e0acb
Commit Graph

69036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
863e7e0acb Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/spl/spl_array.c
 2012-09-01 14:27:09 +08:00
Xinchen Hui
67d7d03f00 Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all undefined variables) 
The get_zval_ptr_ptr of spl_array handler should act as same as the vm's
 2012-09-01 14:21:34 +08:00
Lars Strojny
e658a91b3d assert() user message 
Added 2nd, optional, param to assert. When passed in it will be added
to the printed warnings and passed as a 4th param to a callback. PR 150
by Lonny Kapelushnik
 2012-08-31 19:04:53 +02:00
Xinchen Hui
66fad45724 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-31 11:24:10 +08:00
Xinchen Hui
5dc2cef370 Fixed bug #62976 (Notice: could not be converted to int when comparing some builtin classes) 2012-08-31 11:22:43 +08:00
Felipe Pena
8afb848e18 - BFN 2012-08-30 09:33:35 -03:00
Felipe Pena
eb8d603d46 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
 2012-08-30 09:32:26 -03:00
Felipe Pena
de884997e0 - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry) 2012-08-30 09:32:13 -03:00
Anatoliy Belsky
677de8568a updated mpir version 2012-08-29 17:49:02 +02:00
Gustavo André dos Santos Lopes
521ab78788 Merge 5.3 with strategy ours 
* origin/PHP-5.3:
  Fixed defective cloning in ext/intl classes
 2012-08-29 14:30:47 +01:00
Stanislav Malyshev
55b3386a81 update version id too 2012-08-28 22:10:34 -07:00
Stanislav Malyshev
78cffe0c4d 5.4.7 branched 2012-08-28 22:07:08 -07:00
Stanislav Malyshev
8b3c1a380a fix bug #55856: preg_replace should fail on trailing garbage 2012-08-28 21:59:20 -07:00
Lars Strojny
f82dd2c774 Bug #62956: fixing private method signature validation 
In inheritance, if both methods are private, don not enforce the same
signature.
 2012-08-28 14:06:18 +02:00
Gustavo Lopes
0410b4e60f Fixed defective cloning in ext/intl classes 
See also bug #62915

Cherry picked from 886a50a (I forgot about 5.3)

Conflicts:
	ext/intl/spoofchecker/spoofchecker_class.c
	ext/intl/transliterator/transliterator_class.c
 2012-08-26 23:53:57 +02:00
Gustavo Lopes
c11106734d NEWS for 886a50a 2012-08-26 23:47:00 +02:00
Gustavo Lopes
886a50a619 Fixed defective cloning in ext/intl classes 
See also bug #62915
 2012-08-26 23:42:13 +02:00
Gustavo Lopes
63a1801d19 NEWS for commit 72c807a 2012-08-26 23:39:53 +02:00
Gustavo Lopes
72c807ad67 Allow Spoofchecker to be registered on ICU 49.1 2012-08-26 23:39:04 +02:00
Gustavo Lopes
949f6cd473 Announce on NEWS change in 1ce572c 2012-08-26 22:01:15 +02:00
Gustavo Lopes
1ce572ce2c Bug #62933: compilation error with ICU 3.4 2012-08-26 21:57:53 +02:00
Lars Strojny
8e7081f3ac Merging PR 121 to add support for slow request counting on the PHP-FPM status page 2012-08-26 17:02:39 +02:00
Xinchen Hui
e24194d157 Add test for #62907 2012-08-26 18:28:15 +08:00
Xinchen Hui
383eafe482 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-25 21:50:08 +08:00
Xinchen Hui
d92a89fe52 Fixed bug (segfault while build with zts and GOTO vm-kind) 2012-08-25 21:47:53 +08:00
Pierrick Charron
4c83ecc754 Fixed bug #62912 (CURLINFO_PRIMARY_IP is not exposed) 
CURLINFO_PRIMARY_* and CURLINFO_LOCAL_* where available in curl_getinfo
but the constant itself was not exposed to php userland
 2012-08-24 10:16:40 -04:00
Xinchen Hui
2c74536e6e Merge branch 'PHP-5.3' into PHP-5.4 2012-08-24 18:22:11 +08:00
Xinchen Hui
55d680e968 better fix 2012-08-24 18:21:49 +08:00
Xinchen Hui
1701460867 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/phar/tests/phpinfo_003.phpt
 2012-08-24 18:20:35 +08:00
Xinchen Hui
7bedd275eb Fix test 2012-08-24 18:18:38 +08:00
Xinchen Hui
21f085720c Merge branch 'PHP-5.3' into PHP-5.4 2012-08-23 23:28:02 +08: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
e4a3696553 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  ZTS fix introduced by Felipe must also go into 5.3
  Updated INSTALL. Generated from the XML Docs.
  Update NEWS given a5d0c1e2

Conflicts:
	NEWS
 2012-08-23 13:35:30 +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
Xinchen Hui
87785c7d5a tabs 2012-08-23 16:13:34 +08:00
Xinchen Hui
d39aa984ad Refix #62358, previous has side-affect 2012-08-23 16:06:17 +08:00
Xinchen Hui
6d1bebfcb0 Fixed bug #62358 (Segfault when using traits a lot) 2012-08-23 15:41:49 +08:00
Philip Olson
64bd4551b4 Updated INSTALL. Generated from the XML Docs. 2012-08-22 23:40:48 -07:00
Philip Olson
6a8db0c081 Updated INSTALL. Generated from the XML Docs. 2012-08-22 23:33:29 -07:00
Felipe Pena
b98fc4379f - Fixed ZTS build 2012-08-22 19:39:57 -03:00
Gustavo Lopes
ca4dd76160 Update NEWS given a5d0c1e2 2012-08-22 23:04:46 +02: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
fbacf9c237 - Fix NEWS 2012-08-22 11:19:42 -03:00
Felipe Pena
b721ed57eb - BFN 2012-08-22 10:54:14 -03:00
Felipe Pena
7a56ac00a0 - Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private) 2012-08-22 10:50:50 -03:00