Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.4': Zend/zend_language_scanner.l

2012-04-29 Thread Pierre Joye
hi, Please use VK_ESCAPE instead. Thanks! On Mon, Apr 30, 2012 at 12:36 AM, Felipe Pena wrote: > Commit:    bbe9eec9a2c385f096f4200e0f70d0aea88117b8 > Author:    Felipe Pena         Sun, 29 Apr 2012 > 19:36:10 -0300 > Parents:   7fa45a9399922f324a4fe7e4af8d6f40b0592172 > cc5b995c78038b92317b

[PHP-CVS] com php-src: Revert "Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3": ext/standard/tests/general_functions/proc_nice_basic.phpt

2012-04-29 Thread Xinchen Hui
Commit:d80a3d966898565f48af6417f38803ba85c0be3e Author:Xinchen Hui Mon, 30 Apr 2012 12:31:33 +0800 Parents: 24d85e4bd8d56197ca673791ad007f2e595478cf Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d80a3d966898565f48af6417f38803ba85c0be3e Log: R

[PHP-CVS] com php-src: merge test from PHP-5.4: ext/standard/tests/general_functions/proc_nice_basic.phpt

2012-04-29 Thread Xinchen Hui
Commit:a601605f14ce12977b2d3771fd19421ad2aa2f47 Author:Xinchen Hui Mon, 30 Apr 2012 12:33:55 +0800 Parents: d80a3d966898565f48af6417f38803ba85c0be3e Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a601605f14ce12977b2d3771fd19421ad2aa2f47 Log: m

[PHP-CVS] com php-src: Fix test for proc_nice: bsd ps command didn't support option -o "%p %n": ext/standard/tests/general_functions/proc_nice_basic.phpt

2012-04-29 Thread Xinchen Hui
Commit:e52be10b30d3efd07ba705801b28ee5173b6fe2c Author:reeze Mon, 30 Apr 2012 00:59:54 +0800 Parents: 381edb425e16bd5d472c84d757465aa42cb39d0f Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e52be10b30d3efd07ba705801b28ee5173b6fe2c Log: Fix test

[PHP-CVS] com php-src: Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4: NEWS sapi/cli/php_cli.c

2012-04-29 Thread Xinchen Hui
Commit:fd518ffc7e37a884ced4d34088a6b6c507fd88c2 Author:Xinchen Hui Mon, 30 Apr 2012 12:15:43 +0800 Parents: b336af29e11fbb31d2737cb7f2e42149e8de4208 bae56a87f81b91cd815604b0f404f616b0d73c2b Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fd518f

[PHP-CVS] com php-src: Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).: NEWS sapi/cli/php_cli.c sapi/cli/tests/bug61546.phpt

2012-04-29 Thread Xinchen Hui
Commit:bae56a87f81b91cd815604b0f404f616b0d73c2b Author:Xinchen Hui Mon, 30 Apr 2012 12:09:22 +0800 Parents: 9aff3a1156efdfae7660d5b5e7a6d8b29c263722 Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bae56a87f81b91cd815604b0f404f616b0d73c2b Log: F

[PHP-CVS] com php-src: - BFN: NEWS

2012-04-29 Thread Felipe Pena
Commit:b336af29e11fbb31d2737cb7f2e42149e8de4208 Author:Felipe Pena Sun, 29 Apr 2012 19:48:00 -0300 Parents: cc5b995c78038b92317b38356c9009ff80850d8b Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b336af29e11fbb31d2737cb7f2e42149e8de4208 Log: -

[PHP-CVS] com php-src: - BFN: NEWS

2012-04-29 Thread Felipe Pena
Commit:9aff3a1156efdfae7660d5b5e7a6d8b29c263722 Author:Felipe Pena Sun, 29 Apr 2012 19:44:27 -0300 Parents: d44a3839861113dee10c7041d589096b82f23cc5 Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9aff3a1156efdfae7660d5b5e7a6d8b29c263722 Log: -

[PHP-CVS] com php-src: Merge branch 'PHP-5.4': Zend/zend_language_scanner.l

2012-04-29 Thread Felipe Pena
Commit:bbe9eec9a2c385f096f4200e0f70d0aea88117b8 Author:Felipe Pena Sun, 29 Apr 2012 19:36:10 -0300 Parents: 7fa45a9399922f324a4fe7e4af8d6f40b0592172 cc5b995c78038b92317b38356c9009ff80850d8b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bbe9eec

[PHP-CVS] com php-src: - Fixed bug #61827 (incorrect \e processing on Windows) patch by: a...@php.net: Zend/zend_language_scanner.l

2012-04-29 Thread Felipe Pena
Commit:cc5b995c78038b92317b38356c9009ff80850d8b Author:Felipe Pena Sun, 29 Apr 2012 19:35:52 -0300 Parents: 6008f9af8fa6beab92a4c96d11d641c95f97162c Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cc5b995c78038b92317b38356c9009ff80850d8b

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

2012-04-29 Thread Felipe Pena
Commit:6008f9af8fa6beab92a4c96d11d641c95f97162c Author:Felipe Pena Sun, 29 Apr 2012 19:14:03 -0300 Parents: 6f8fae606bcbf37cea4d6e03a065a705924b08bf d44a3839861113dee10c7041d589096b82f23cc5 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: - Added missing bound check in iptcparse() (path by chris at chiappa.net): ext/standard/iptc.c

2012-04-29 Thread Felipe Pena
Commit:d44a3839861113dee10c7041d589096b82f23cc5 Author:Felipe Pena Sun, 29 Apr 2012 19:12:12 -0300 Parents: dc6d283b1c277c2c99a794d17a2e2540a9f2e60e Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d44a3839861113dee10c7041d589096b8