]>
granicus.if.org Git - php/log
Stanislav Malyshev [Wed, 29 Aug 2012 05:05:36 +0000 (22:05 -0700)]
5.4.7 rc1
Stanislav Malyshev [Sat, 30 Jun 2012 23:31:26 +0000 (16:31 -0700)]
fix bug #55856: preg_replace should fail on trailing garbage
Lars Strojny [Tue, 28 Aug 2012 12:06:18 +0000 (14:06 +0200)]
Bug #62956: fixing private method signature validation
In inheritance, if both methods are private, don not enforce the same
signature.
Gustavo Lopes [Sun, 26 Aug 2012 21:47:00 +0000 (23:47 +0200)]
Gustavo Lopes [Sun, 26 Aug 2012 21:37:09 +0000 (23:37 +0200)]
Fixed defective cloning in ext/intl classes
See also bug #62915
Gustavo Lopes [Sun, 26 Aug 2012 21:39:53 +0000 (23:39 +0200)]
Gustavo Lopes [Sun, 26 Aug 2012 21:30:43 +0000 (23:30 +0200)]
Allow Spoofchecker to be registered on ICU 49.1
Gustavo Lopes [Sun, 26 Aug 2012 20:01:15 +0000 (22:01 +0200)]
Announce on NEWS change in
1ce572c
Gustavo Lopes [Sun, 26 Aug 2012 19:57:50 +0000 (21:57 +0200)]
Bug #62933: compilation error with ICU 3.4
Lars Strojny [Sun, 26 Aug 2012 15:02:39 +0000 (17:02 +0200)]
Merging PR 121 to add support for slow request counting on the PHP-FPM status page
Xinchen Hui [Sun, 26 Aug 2012 10:28:15 +0000 (18:28 +0800)]
Add test for #62907
Xinchen Hui [Sat, 25 Aug 2012 13:49:29 +0000 (21:49 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sat, 25 Aug 2012 13:47:53 +0000 (21:47 +0800)]
Fixed bug (segfault while build with zts and GOTO vm-kind)
Pierrick Charron [Fri, 24 Aug 2012 14:16:40 +0000 (10:16 -0400)]
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
Xinchen Hui [Fri, 24 Aug 2012 10:22:11 +0000 (18:22 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Fri, 24 Aug 2012 10:21:49 +0000 (18:21 +0800)]
better fix
Xinchen Hui [Fri, 24 Aug 2012 10:20:35 +0000 (18:20 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
ext/phar/tests/phpinfo_003.phpt
Xinchen Hui [Fri, 24 Aug 2012 10:18:38 +0000 (18:18 +0800)]
Fix test
Xinchen Hui [Thu, 23 Aug 2012 15:28:02 +0000 (23:28 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 23 Aug 2012 15:27:16 +0000 (23:27 +0800)]
Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)
Xinchen Hui [Thu, 23 Aug 2012 15:21:25 +0000 (23:21 +0800)]
Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)
Anatoliy Belsky [Thu, 23 Aug 2012 15:09:45 +0000 (17:09 +0200)]
fixing test for upcoming mpir upgrade
- mpir is going to be upgraded up to 2.5.1 on windows
Anatoliy Belsky [Thu, 23 Aug 2012 11:35:30 +0000 (13:35 +0200)]
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
Anatoliy Belsky [Thu, 23 Aug 2012 11:32:06 +0000 (13:32 +0200)]
ZTS fix introduced by Felipe must also go into 5.3
Gustavo André dos Santos Lopes [Thu, 23 Aug 2012 09:32:05 +0000 (10:32 +0100)]
Fix SPOOFCHECKER_METHOD_FETCH_OBJECT definition
Xinchen Hui [Thu, 23 Aug 2012 08:13:34 +0000 (16:13 +0800)]
tabs
Xinchen Hui [Thu, 23 Aug 2012 08:06:17 +0000 (16:06 +0800)]
Refix #62358, previous has side-affect
Xinchen Hui [Thu, 23 Aug 2012 07:41:49 +0000 (15:41 +0800)]
Fixed bug #62358 (Segfault when using traits a lot)
Philip Olson [Thu, 23 Aug 2012 06:40:48 +0000 (23:40 -0700)]
Updated INSTALL. Generated from the XML Docs.
Philip Olson [Thu, 23 Aug 2012 06:33:29 +0000 (23:33 -0700)]
Updated INSTALL. Generated from the XML Docs.
Felipe Pena [Wed, 22 Aug 2012 22:39:57 +0000 (19:39 -0300)]
- Fixed ZTS build
Gustavo Lopes [Wed, 22 Aug 2012 21:04:46 +0000 (23:04 +0200)]
Update NEWS given
a5d0c1e2
Gustavo Lopes [Wed, 22 Aug 2012 20:38:31 +0000 (22:38 +0200)]
Fix handling of several uinitialized intl objects
PHP 5.4 specific changes. Not having this in the merge commit helps
porting to pecl/intl
Gustavo Lopes [Wed, 22 Aug 2012 20:37:52 +0000 (22:37 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix handling of several uinitialized intl objects
Gustavo Lopes [Tue, 21 Aug 2012 21:21:59 +0000 (23:21 +0200)]
Fix handling of several uinitialized intl objects
Felipe Pena [Wed, 22 Aug 2012 14:19:42 +0000 (11:19 -0300)]
- Fix NEWS
Felipe Pena [Wed, 22 Aug 2012 13:54:14 +0000 (10:54 -0300)]
- BFN
Felipe Pena [Wed, 22 Aug 2012 13:50:50 +0000 (10:50 -0300)]
- Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private)
Anatoliy Belsky [Wed, 22 Aug 2012 09:43:12 +0000 (11:43 +0200)]
Fixed bug #62313 Zend\tests\errmsg_021.phpt fails
Xinchen Hui [Wed, 22 Aug 2012 05:49:04 +0000 (13:49 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 22 Aug 2012 05:41:47 +0000 (13:41 +0800)]
Fixed bug #62885 (mysqli_poll - Segmentation fault)
Felipe Pena [Tue, 21 Aug 2012 23:15:48 +0000 (20:15 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Removed PHP 6 checks
Felipe Pena [Tue, 21 Aug 2012 23:15:34 +0000 (20:15 -0300)]
- Removed PHP 6 checks
Xinchen Hui [Tue, 21 Aug 2012 14:15:54 +0000 (22:15 +0800)]
skip test properly
Xinchen Hui [Tue, 21 Aug 2012 14:14:17 +0000 (22:14 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 21 Aug 2012 14:11:11 +0000 (22:11 +0800)]
skip test properly
Anatoliy Belsky [Tue, 21 Aug 2012 11:24:54 +0000 (13:24 +0200)]
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.
Anatoliy Belsky [Tue, 21 Aug 2012 11:22:00 +0000 (13:22 +0200)]
Added test for bug #51353. It'll be skipped by default and must be
activated manually.
Lars Strojny [Tue, 21 Aug 2012 08:09:23 +0000 (10:09 +0200)]
Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
Lars Strojny [Tue, 21 Aug 2012 08:08:46 +0000 (10:08 +0200)]
Bug 62462: adjusting test
Xinchen Hui [Tue, 21 Aug 2012 07:23:09 +0000 (15:23 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Reeze Xia [Tue, 21 Aug 2012 06:32:39 +0000 (14:32 +0800)]
Move test files to tests dir
There are 7 files duplicated, so those files was deleted
Xinchen Hui [Tue, 21 Aug 2012 05:32:15 +0000 (13:32 +0800)]
Implemented FR #62840 (Add sort flag to ArrayObject::ksort)
Lars Strojny [Mon, 20 Aug 2012 21:42:31 +0000 (23:42 +0200)]
Bug 62462: Prevent multibyte characters from being split between the lines
Merged from https://github.com/php/php-src/pull/120
Xinchen Hui [Mon, 20 Aug 2012 15:44:21 +0000 (23:44 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Popa Adrian Marius [Mon, 20 Aug 2012 13:56:37 +0000 (16:56 +0300)]
skip test for bug 43130 on firebird , not relevant
Stanislav Malyshev [Mon, 20 Aug 2012 05:19:57 +0000 (22:19 -0700)]
Fix for #62844
Andrew Faulds [Sun, 19 Aug 2012 23:29:18 +0000 (00:29 +0100)]
relative-scheme
Andrew Faulds [Sun, 19 Aug 2012 23:03:55 +0000 (00:03 +0100)]
bug #62844; relative URL schemes in parse_url()
Stanislav Malyshev [Mon, 20 Aug 2012 03:37:44 +0000 (20:37 -0700)]
update NEWS
Felipe Pena [Sun, 19 Aug 2012 18:09:18 +0000 (15:09 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Value stored to var is never used
Felipe Pena [Sun, 19 Aug 2012 18:09:14 +0000 (15:09 -0300)]
- Value stored to var is never used
Felipe Pena [Sun, 19 Aug 2012 17:50:52 +0000 (14:50 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Value stored to var is never used
Felipe Pena [Sun, 19 Aug 2012 17:50:49 +0000 (14:50 -0300)]
- Value stored to var is never used
Felipe Pena [Sun, 19 Aug 2012 17:34:42 +0000 (14:34 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Value stored to var is never used
Felipe Pena [Sun, 19 Aug 2012 17:34:38 +0000 (14:34 -0300)]
- Value stored to var is never used
Felipe Pena [Sun, 19 Aug 2012 15:55:43 +0000 (12:55 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Value stored to var is never used
Felipe Pena [Sun, 19 Aug 2012 15:55:38 +0000 (12:55 -0300)]
- Value stored to var is never used
Felipe Pena [Sun, 19 Aug 2012 15:44:49 +0000 (12:44 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Value stored to var is never used
Felipe Pena [Sun, 19 Aug 2012 15:44:44 +0000 (12:44 -0300)]
- Value stored to var is never used
Felipe Pena [Sun, 19 Aug 2012 15:13:59 +0000 (12:13 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Value stored to var is never read
Felipe Pena [Sun, 19 Aug 2012 15:13:48 +0000 (12:13 -0300)]
- Value stored to var is never read
Xinchen Hui [Sun, 19 Aug 2012 10:33:37 +0000 (18:33 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sun, 19 Aug 2012 10:33:06 +0000 (18:33 +0800)]
Update NEWS
Reeze Xia [Sun, 19 Aug 2012 09:57:45 +0000 (17:57 +0800)]
Fixed bug #62852 (Unserialize invalid DateTime causes crash)
Xinchen Hui [Sat, 18 Aug 2012 04:21:48 +0000 (12:21 +0800)]
Fix test failed
Anatoliy Belsky [Fri, 17 Aug 2012 18:31:00 +0000 (20:31 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
More intl tests extracted from symfony
Matt Ficken [Fri, 17 Aug 2012 18:29:08 +0000 (20:29 +0200)]
More intl tests extracted from symfony
Adam Harvey [Fri, 17 Aug 2012 15:07:54 +0000 (23:07 +0800)]
Update version numbers to 5.4.7-dev.
Xinchen Hui [Fri, 17 Aug 2012 10:28:32 +0000 (18:28 +0800)]
Fixed bug #62836 (Seg fault or broken object references on unserialize())
Pierrick Charron [Thu, 16 Aug 2012 18:50:06 +0000 (14:50 -0400)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #62839
Pierrick Charron [Thu, 16 Aug 2012 18:48:44 +0000 (14:48 -0400)]
Fixed bug #62839
curl_copy_handle segfault with CURLOPT_FILE. The refcount was incremented
before the assignement.
Felipe Pena [Thu, 16 Aug 2012 18:45:21 +0000 (15:45 -0300)]
- Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set)
Antony Dovgal [Thu, 16 Aug 2012 10:34:32 +0000 (14:34 +0400)]
Merge commit '
8649e42' into PHP-5.4
* commit '
8649e42':
Fixed bug #62838
Antony Dovgal [Thu, 16 Aug 2012 10:32:55 +0000 (14:32 +0400)]
Fixed bug #62838
enchant_dict_quick_check() destroys zval, but fails to initialize it
Christopher Jones [Tue, 14 Aug 2012 21:13:03 +0000 (14:13 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix skipifs
Christopher Jones [Tue, 14 Aug 2012 21:12:27 +0000 (14:12 -0700)]
Merge branch 'skipif1' into PHP-5.3
* skipif1:
Fix skipifs
Christopher Jones [Tue, 14 Aug 2012 21:10:20 +0000 (14:10 -0700)]
Fix skipifs
Skipifs were referencing an unset variable
Christopher Jones [Tue, 14 Aug 2012 18:45:24 +0000 (11:45 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Small test tidy up
Christopher Jones [Tue, 14 Aug 2012 18:41:36 +0000 (11:41 -0700)]
Small test tidy up
Make some test changes so the tests can be run with the CLI webserver
Xinchen Hui [Tue, 14 Aug 2012 17:25:31 +0000 (01:25 +0800)]
better fix & this test pass now
Xinchen Hui [Tue, 14 Aug 2012 17:08:19 +0000 (01:08 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 14 Aug 2012 17:06:10 +0000 (01:06 +0800)]
Merge fix
e7535e06e63104ccc0c90c4425b6c2541aa3c939 to 5.3
thanks for reeze.xia@gmail.com notice this
Xinchen Hui [Tue, 14 Aug 2012 16:47:08 +0000 (00:47 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 14 Aug 2012 16:46:56 +0000 (00:46 +0800)]
update NEWS
Xinchen Hui [Tue, 14 Aug 2012 16:44:47 +0000 (00:44 +0800)]
Fixed bug (segfault due to retval is not initialized)
Xinchen Hui [Tue, 14 Aug 2012 16:31:57 +0000 (00:31 +0800)]
Attempt to fix segfault due to retval is not initialized
Xinchen Hui [Tue, 14 Aug 2012 16:25:06 +0000 (00:25 +0800)]
improve the fix
Xinchen Hui [Tue, 14 Aug 2012 16:15:34 +0000 (00:15 +0800)]
Fixed bug (segfault due to PS(mod_user_implemented) not be reseted when closing handler call exit)
Nikita Popov [Tue, 14 Aug 2012 15:37:10 +0000 (17:37 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4