Re: [PHP-CVS] com php-src: forgot this file :(: ext/curl/curl_file.c

2013-04-06 Thread Hannes Magnusson
On Tue, Jan 29, 2013 at 3:02 PM, Stanislav Malyshev wrote: > Commit:15e76e6a98ded4f28aa8d5a91b2286497e44fc5b > Author:Stanislav Malyshev Tue, 29 Jan 2013 > 15:02:55 -0800 > Parents: 26de5cc57fa39b9682cd5523711638d98fa6fddd > Branches: PHP-5.5 master > > Link: > http://g

Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/curl/interface.c

2013-04-06 Thread Hannes Magnusson
On Tue, Apr 2, 2013 at 7:15 PM, Xinchen Hui wrote: > Commit:6ace9c646b56707723f44c9fa6a46a907e1292f3 > Author:Xinchen Hui Wed, 3 Apr 2013 10:15:41 > +0800 > Parents: 688f5fc8897fe505de80640a75a290338bf5c2fb > 78a9489f6a7326dd0ce0c2baaf37c94a0a85f931 > Branches: PHP-5.5 > > Li

Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/curl/interface.c

2013-04-06 Thread Laruence
Hey: this is because the merge conflict, you should see the diff against 5.5 branch On Sun, Apr 7, 2013 at 1:12 AM, Hannes Magnusson wrote: > On Tue, Apr 2, 2013 at 7:15 PM, Xinchen Hui wrote: > > Commit:6ace9c646b56707723f44c9fa6a46a907e1292f3 > > Author:Xinchen Hui Wed,

[PHP-CVS] com php-src: leave a sane environment behind (even if empty) when exiting some OS atexit() handlers call getenv(): sapi/cli/ps_title.c

2013-04-06 Thread Nuno Lopes
Commit:1a71bf646e799851dacb2fbe1a439f21543ca590 Author:Nuno Lopes Sun, 7 Apr 2013 02:32:20 -0400 Parents: bd96813042c7aecde34e65d0e1f96ce7e8214da7 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a71bf646e799851dacb2fbe1a439f21543ca590 Log: leave

[PHP-CVS] com php-src: leave a sane environment behind (even if empty) when exiting some OS atexit() handlers call getenv(): sapi/cli/ps_title.c

2013-04-06 Thread Nuno Lopes
Commit:e769025791e1696dcb6bc09c9b066844df4ce763 Author:Nuno Lopes Sun, 7 Apr 2013 02:32:20 -0400 Parents: 5ac8084e5f339132e7aa94b83bddfcd16641e9be Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e769025791e1696dcb6bc09c9b066844df4ce763 Log: leav