Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/pdo_mysql/mysql_statement.c

2012-03-24 Thread Pierrick Charron
Hmmm I think I have the same issue as Hannes. All those changes are not the one I did on the 5.3 branch. Any clue on how to deal with that ? Thanks Pierrick On 24 March 2012 17:59, Pierrick Charron pierr...@php.net wrote: Commit:7f05a39fce42029c126d6dc315ffdad43d27c8e9 Author:Pierrick

Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/pdo_mysql/mysql_statement.c

2012-03-24 Thread Pierrick Charron
I looked at the git log/diff and I think there is a problem with the mailing system. It did not send the diff from the good parent for the merge. Pierrick On 24 March 2012 18:07, Pierrick Charron pierr...@php.net wrote: Hmmm I think I have the same issue as Hannes. All those changes are not

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/spl/spl_directory.c

2012-03-22 Thread David Soria Parra
Commit:b60f9fe146eea4edbcc1c17172d8ee3c0c719c82 Author:David Soria Parra d...@php.net Thu, 22 Mar 2012 12:13:52 +0100 Parents: 0b646e8027131a1fb127e1e6cc845319b65e46a4 14af1fe6923c65a91cd77eab5a8d4326f854391d Branches: PHP-5.4 5bf1efbf209b7d14edc8d01098465ed0bdda1516

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/spl/spl_directory.c

2012-03-22 Thread Stanislav Malyshev
Commit:bcc15b56331f3055c99d8c126a61f48b33229c1c Author:Stanislav Malyshev s...@php.net Thu, 22 Mar 2012 22:30:51 -0700 Parents: ee755fafb99ba618fd82bbe05758ace68584ded1 a89c4a34ee55686ab1430a5060e1460335fc5203 Branches: master Link:

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/soap/php_http.c ext/soap/php_sdl.c

2012-03-21 Thread Dmitry Stogov
Commit:a8cc0b05b45110ccf408ea9410447bf82b8826f2 Author:Dmitry Stogov dmi...@zend.com Wed, 21 Mar 2012 16:42:08 +0400 Parents: 1e18f11c9ab56fb120c9e26ecd3f68f0651cddde 657547f8c4758efcf85c73fec6d7fd8b3983d7cb Branches: PHP-5.4 master Link:

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4:

2012-03-20 Thread Xinchen Hui
Commit: 14ccdd1b556e5965bba9da11c584e9306f0349da Author: Xinchen Hui larue...@php.net Tue, 20 Mar 2012 17:21:35 +0800 Committer: Xinchen Hui larue...@php.net Tue, 20 Mar 2012 17:21:35 +0800 Parents: 868dbe127ac12586e5fc6a8e3514eb5007477fee 7aa2b75db2efceff502c87c5bcb4db81accf4024

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4:

2012-03-20 Thread Martin Jansen
Commit:c337f69157f95402650dded274919ded47d0a78e Author:Martin Jansen m...@php.net Tue, 20 Mar 2012 11:15:28 +0100 Parents: 868dbe127ac12586e5fc6a8e3514eb5007477fee 52ec6f761eea3335e906f3abccbb122eb3044bb7 Link:

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/json/json.c

2012-03-20 Thread David Soria Parra
Commit:71d894cd421d96517618e9d33dfea640499c8ffd Author:David Soria Parra d...@php.net Tue, 20 Mar 2012 17:29:20 +0100 Parents: 14ccdd1b556e5965bba9da11c584e9306f0349da 76ef76d2f875ccc3c9529565bdb29451a9b087ef Link:

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4:

2012-03-20 Thread Stanislav Malyshev
Commit:f3f76e5e8af265cd59d8edb7fb0827be6abc9a5a Author:Stanislav Malyshev smalys...@gmail.com Tue, 20 Mar 2012 10:02:22 -0700 Parents: c918ca57a7233206ec78ac00438eeb6830e3680b cb4e82a1cc16457da224dd045842583c69bfa00e Link:

<    1   2   3