[PHP-CVS] svn: /SVNROOT/ global_avail

2012-02-27 Thread Johannes Schlüter
johannes Mon, 27 Feb 2012 18:41:22 + Revision: http://svn.php.net/viewvc?view=revision&revision=323600 Log: Add karma for web/php-distributions.git Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c branches/PHP_5_3/ext/pdo_mysql/tests/bug_61207.phpt branches/PHP_5_4/ext/pdo_mysql/mysql_statement.c branches/PHP_5_4/ext/

2012-03-05 Thread Johannes Schlüter
johannes Mon, 05 Mar 2012 23:38:15 + Revision: http://svn.php.net/viewvc?view=revision&revision=323928 Log: Fix Bug #61207 PDO::nextRowset() after a multi-statement query doesn't always work Bug: https://bugs.php.net/61207 (Assigned) PDO::nextRowset() after a

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysqlnd/mysqlnd_wireprotocol.c trunk/ext/mysqlnd/mysqlnd_wireprotocol.c

2012-03-05 Thread Johannes Schlüter
johannes Mon, 05 Mar 2012 23:55:12 + Revision: http://svn.php.net/viewvc?view=revision&revision=323929 Log: Fix bug #60948 mysqlnd FTBFS when -Wformat-security is enabled # 5.3 not affected Bugs: https://bugs.php.net/60948 (Assigned) mysqlnd FTBFS when -Wfor

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h branches/

2012-03-05 Thread Johannes Schlüter
johannes Mon, 05 Mar 2012 23:57:24 + Revision: http://svn.php.net/viewvc?view=revision&revision=323930 Log: Fix bug #61194 PDO should export compression flag with myslqnd Bug: https://bugs.php.net/61194 (Closed) PDO should export compression flag with myslqnd

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mysqli/mysqli_prop.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/mysqli/mysqli_prop.c trunk/ext/mysqli/mysqli_prop.c

2012-03-05 Thread Johannes Schlüter
johannes Tue, 06 Mar 2012 00:15:40 + Revision: http://svn.php.net/viewvc?view=revision&revision=323931 Log: Fix bug #61003 mysql_stat() require a valid connection Bug: https://bugs.php.net/61003 (Assigned) mysql_stat() require a valid connection Change

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt trunk/ext

2012-03-05 Thread Johannes Schlüter
johannes Tue, 06 Mar 2012 01:43:49 + Revision: http://svn.php.net/viewvc?view=revision&revision=323932 Log: Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails Bug: https://bugs.php.net/61288 (Open) pdo_mysql___construct_opti

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqli/ mysqli.c

2012-03-08 Thread Johannes Schlüter
johannes Thu, 08 Mar 2012 12:52:12 + Revision: http://svn.php.net/viewvc?view=revision&revision=324022 Log: Use correct property ctor, should fix threading issue in bug #55334 # The code was refactored in 5_4/trunk, no need to merge Bug: https://bugs.php.net/5

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

2012-03-22 Thread Johannes Schlüter
Commit:1a0b0ead145deb150f9efb6004534018b5af3a35 Author:Johannes Schlüter Thu, 22 Mar 2012 16:40:13 +0100 Parents: b4aea52682a6e7a8f0e2a7638ba37145cb6bf16d Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a0b0ead145deb150f9efb6004534018b5af3a35

Re: [PHP-CVS] com php-src: Fix NEWS: NEWS

2012-03-24 Thread Johannes Schlüter
On Sat, 2012-03-24 at 07:59 +0100, Michael Wallner wrote: > Looks like the commit/mail script still does some superfluous html > entitiy encoding: No it's not the mail script ;-) master.php.net has filter.default=full_special_chars so when storing my name it is automatically escaped and the escap

[PHP-CVS] com php-src: Merge remote branch 'security/PHP-5.3' into PHP-5.3: NEWS

2012-03-29 Thread Johannes Schlüter
Commit:21fa9634c19210050b130bed9f3ac77c5332080b Author:Johannes Schlüter Thu, 29 Mar 2012 10:54:08 +0200 Parents: 67bf07f3e79de6653681d9317229c49b5e2415db 167e2fd78224887144496cdec2089cd5b2f3312d Branches: PHP-5.3 PHP-5.4 master PHP-5.3.11 Link: http://git.php.net/?p

[PHP-CVS] com php-src: PHP 5.3.11RC1: NEWS configure.in main/php_version.h

2012-03-29 Thread Johannes Schlüter
Commit:9ad0b878d91064d78bcd093a4660ea2bf99b03fb Author:Johannes Schlüter Thu, 29 Mar 2012 11:17:41 +0200 Parents: 21fa9634c19210050b130bed9f3ac77c5332080b Branches: PHP-5.3.11 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] tag php-src: create tag php-5.3.11RC1

2012-03-29 Thread Johannes Schlüter
Tag php-5.3.11RC1 in php-src.git was created Tag: b9fe2c872dd5691b22ea28db8c62ca6063be6cd7 Tagger: Johannes Schlüter Thu Mar 29 11:39:06 2012 +0200 Log: PHP-5.3.11RC1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJPdC3QAAoJEH3sTmn8nIPXBYsH

[PHP-CVS] svn: /SVNROOT/ global_avail

2012-03-30 Thread Johannes Schlüter
johannes Fri, 30 Mar 2012 21:13:37 + Revision: http://svn.php.net/viewvc?view=revision&revision=324649 Log: Fix unavail rule for Zend and TSRM Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail =

Re: [PHP-CVS] com php-src: Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails: ext/fileinfo/libmagic/cdf.c ext/fileinfo/libmagic/compress.c ext/fileinfo/libmagic/file.h ext/fileinfo/libm

2012-04-04 Thread Johannes Schlüter
On Mon, 2012-04-02 at 15:22 +, Anatoliy Belsky wrote: > Commit:909713e233704b4ac317ff3bb397cb40a82795b8 > Author:Anatoliy Belsky Mon, 2 Apr 2012 17:22:46 > +0200 > Parents: 0cdba53aae783fd63f0aa525bc92e73d9e4c0aab > Branches: PHP-5.3 PHP-5.4 master > > Link: > http:

Re: [PHP-CVS] com php-src: - Updated to version 2012.3 (2012c): ext/date/lib/timezonedb.h

2012-04-04 Thread Johannes Schlüter
On Mon, 2012-04-02 at 09:40 +, Derick Rethans wrote: > Commit:0e53ac49e60b4a58a918aa311bbca405e9185fcf > Author:Derick Rethans Mon, 2 Apr 2012 > 10:40:01 +0100 > Parents: 66b3b44fd50df88139851760a2b58a8bb33ffabe > Branches: PHP-5.3 PHP-5.4 master > > Link: > http://

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

2012-04-04 Thread Johannes Schlüter
On Thu, 2012-03-29 at 10:55 +, Yasuo Ohgaki wrote: > > Commit:aecf5485e3af6a1e405f29f653353ae1237dbb3e > Author:Yasuo Ohgaki Thu, 29 Mar 2012 > 19:55:06 +0900 > Parents: 1d8664b90b4007b81206d39f3453eb4e7987776d > 931831bf75d645bdb9f079793b0224bb4843a7a3 > Branches: PHP-5.4

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

2012-04-12 Thread Johannes Schlüter
Commit:1b444d85e09d476ac865c7ba6f5eba7a9013e569 Author:Johannes Schlüter Thu, 12 Apr 2012 11:21:19 +0200 Parents: cf987063765e5bdcf8fb9432ef85cdd1ca8a56d9 Branches: PHP-5.3.11 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Remove cherry-picked items for 5.3.11: NEWS

2012-04-12 Thread Johannes Schlüter
Commit:1461a40301cf8a32ea8df7c2d0da0e330615a5a5 Author:Johannes Schlüter Thu, 12 Apr 2012 11:21:41 +0200 Parents: 3f3ad30c50c32327e723046bcc6649d05dd9236a Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1461a40301cf8a32ea8df7c2d0da0e330615a5a5

[PHP-CVS] com php-src: Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails: ext/fileinfo/libmagic/cdf.c ext/fileinfo/libmagic/compress.c ext/fileinfo/libmagic/file.h ext/fileinfo/libmagic

2012-04-12 Thread Johannes Schlüter
Commit:cf987063765e5bdcf8fb9432ef85cdd1ca8a56d9 Author:Anatoliy Belsky Mon, 2 Apr 2012 17:22:46 +0200 Committer: Johannes Schlüter Thu, 12 Apr 2012 11:12:10 +0200 Parents: 56771b86481c7d5fdd92b1e8e1a29b662513f904 Branches: PHP-5.3.11 Link: http://git.php.net/?p

[PHP-CVS] com php-src: Disabled EOL conversions on certain tests: .gitattributes

2012-04-12 Thread Johannes Schlüter
Commit:11b5738aef70258c8d1da10d0ea64144ab57a2be Author:Gustavo André dos Santos Lopes Tue, 10 Apr 2012 19:41:07 +0100 Committer: Johannes Schlüter Thu, 12 Apr 2012 11:10:16 +0200 Parents: aa45b5405e472eda27067c0abcc2f7065337baee Branches: PHP-5.3.11 Link: http

[PHP-CVS] com php-src: Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less): ext/pgsql/pgsql.c

2012-04-12 Thread Johannes Schlüter
Commit:aa45b5405e472eda27067c0abcc2f7065337baee Author:Yasuo Ohgaki Thu, 29 Mar 2012 19:48:58 +0900 Committer: Johannes Schlüter Thu, 12 Apr 2012 11:08:46 +0200 Parents: 74c92f77c197385ea72703b6f3e0de3bf58c1efd Branches: PHP-5.3.11 Link: http://git.php.net/?p

[PHP-CVS] com php-src: Cherry-pick 4cc74767: ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227_2.phpt ext/standard/tests/general_functions/bug60227_3.p

2012-04-12 Thread Johannes Schlüter
Commit:7ac36ec8e5bfbbe06019d6123a7ae5eb908fc5e3 Author:Johannes Schlüter Thu, 12 Apr 2012 11:08:00 +0200 Parents: 8ccf0655776c512f1e1c341e115e07d0e8ba6091 Branches: PHP-5.3.11 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2)): main/SAPI.c

2012-04-12 Thread Johannes Schlüter
Commit:8ccf0655776c512f1e1c341e115e07d0e8ba6091 Author:Xinchen Hui Fri, 6 Apr 2012 21:42:40 +0800 Committer: Johannes Schlüter Thu, 12 Apr 2012 11:04:39 +0200 Parents: a4e6394a06fb11f80426e94874d0702cf5235726 Branches: PHP-5.3.11 Link: http://git.php.net/?p=php

[PHP-CVS] com php-src: Fixed bug in new stream_get_line() when using NUL as a delimiter.: ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt main/streams/streams.c

2012-04-12 Thread Johannes Schlüter
Commit:a4e6394a06fb11f80426e94874d0702cf5235726 Author:Gustavo André dos Santos Lopes Sat, 7 Apr 2012 16:32:19 +0100 Committer: Johannes Schlüter Thu, 12 Apr 2012 11:04:20 +0200 Parents: 9ad0b878d91064d78bcd093a4660ea2bf99b03fb Branches: PHP-5.3.11 Link: http

[PHP-CVS] tag php-src: create tag php-5.3.11RC2

2012-04-12 Thread Johannes Schlüter
Tag php-5.3.11RC2 in php-src.git was created Tag: 42b8871e4475aef356bec73b9d57afc8b1ff0831 Tagger: Johannes Schlüter Thu Apr 12 11:30:29 2012 +0200 Log: PHP 5.3.11RC2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJPhqDFAAoJEH3sTmn8nIPXqiEH

Re: [PHP-CVS] com php-src: Fix bug #61537 (json_encode() incorrectly truncates/discards information) and remove a test case that's now mooted by this fix.: NEWS ext/json/json.c ext/json/php_json.h ext

2012-04-12 Thread Johannes Schlüter
Hi, please make sure to merge things upwards. i see the patch was applied to 5.4 and master, too, but git doesn't know about the merge. johannes On Mon, 2012-04-02 at 01:46 +, Adam Harvey wrote: > Commit:3f3ad30c50c32327e723046bcc6649d05dd9236a > Author:Adam Harvey Mon, 2 Ap

[PHP-CVS] com php-src: Move and update README.SVN-RULES to README.GIT-RULES: README.GIT-RULES README.SVN-RULES

2012-04-12 Thread Johannes Schlüter
Commit:e0d5138660668fc2fb6d111c76ad10ab95e9486e Author:Johannes Schlüter Fri, 13 Apr 2012 02:12:47 +0200 Parents: 8c4294bcb47b967c51c48bdd1a1952bd0c17d319 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Rename README.SVN-RULES to README.GIT-RULES, here, too: win32/build/confutils.js

2012-04-13 Thread Johannes Schlüter
Commit:21d314a767561204cdeba896b85e61e1bb6cafac Author:Johannes Schlüter Sat, 14 Apr 2012 00:29:55 +0200 Parents: e9b978c374e0b8f2afd32ff07920f419fce4b9fb Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: win32/build/confutils.js

2012-04-13 Thread Johannes Schlüter
Commit:6ecac269728360180a2813e75dfbe8338a05a27a Author:Johannes Schlüter Sat, 14 Apr 2012 00:31:00 +0200 Parents: de6dfe5bbd197e6387f0044b857b518e29e27283 21d314a767561204cdeba896b85e61e1bb6cafac Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a

Re: [PHP-CVS] com php-src: Fixed bug #61728 (php-fpm SIGSEGV running friendica on nginx): NEWS ext/session/tests/bug61728.phpt main/main.c

2012-04-17 Thread Johannes Schlüter
On Sun, 2012-04-15 at 13:00 +0800, Laruence wrote: > On Sun, Apr 15, 2012 at 12:36 PM, Stas Malyshev > wrote: > > Hi! > > > >>> I'm not sure this is a good idea - output buffers can include output > >>> functions IIRC, but you have already shut down modules. I would be very, > >> Stas, they are r

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

2012-04-18 Thread Johannes Schlüter
Commit:d6394e66a31e788560e664d6823d30b2e759d7cb Author:Yasuo Ohgaki Tue, 17 Apr 2012 16:34:47 +0900 Committer: Johannes Schlüter Wed, 18 Apr 2012 12:21:05 +0200 Parents: cce0f8e507c05ecc7c8222efa5005991f04ce4c0 Branches: PHP-5.4 master Link: http://git.php.net

[PHP-CVS] com php-src: Implement Request #47570 libpq's PG_VERSION should be exported to userland: ext/pgsql/pgsql.c

2012-04-18 Thread Johannes Schlüter
Commit:cce0f8e507c05ecc7c8222efa5005991f04ce4c0 Author:Yasuo Ohgaki Fri, 30 Mar 2012 09:45:33 +0900 Committer: Johannes Schlüter Wed, 18 Apr 2012 12:20:35 +0200 Parents: d55afe4df63945a6e3abe9892ba7836f83c74265 Branches: PHP-5.4 master Link: http://git.php.net

[PHP-CVS] HEADS UP: Force pushed to revert to d55afe4df63945a6e3abe9892ba7836f83c74265

2012-04-18 Thread Johannes Schlüter
within the last few minutes please make sure that you do not have the revision 885e57517ad6057b497b2c90482ddb2d58ac1a2b and don't push that revision to the repository. johannes Changes reapplied: commit 0618e33b5dbac73efc0893884051b5c24e7ab409 Merge: d6394e6 da6465a Author: Johannes Schlüter

[PHP-CVS] Re: [PHP-DEV] HEADS UP: Force pushed to revert to d55afe4df63945a6e3abe9892ba7836f83c74265

2012-04-18 Thread Johannes Schlüter
On Wed, 2012-04-18 at 12:35 +0200, Johannes Schlüter wrote: > Hi, > > the master branch was accidentally merged into the 5.4 branch. I > reverted that by force pushing the old revision > d55afe4df63945a6e3abe9892ba7836f83c74265 into PHP-5.4 and then > cherry-picking all re

[PHP-CVS] com php-src: Update generated file.: ext/pdo/pdo_sql_parser.c

2012-04-18 Thread Johannes Schlüter
Commit:e946eaca0bc747615fabd0fedb8a92ea800ed158 Author:Johannes Schlüter Wed, 18 Apr 2012 22:47:14 +0200 Parents: dda60f3014743fcbfc1078a8e52b4d7b2e09b839 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Ensure the SQL parser is regenerated after changes.: ext/pdo/Makefile.frag

2012-04-18 Thread Johannes Schlüter
Commit:dda60f3014743fcbfc1078a8e52b4d7b2e09b839 Author:Johannes Schlüter Wed, 18 Apr 2012 22:45:59 +0200 Parents: f3d86b314f4977f95844aa4eaa41759c8d71c247 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Fix slight grammar glitch (thanks Dan Brown): php.ini-development php.ini-production

2012-04-18 Thread Johannes Schlüter
Commit:710021d1d4a57941450b7ed482e3c19cfe62fecf Author:Johannes Schlüter Thu, 19 Apr 2012 00:07:40 +0200 Parents: e946eaca0bc747615fabd0fedb8a92ea800ed158 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: php.ini-development php.ini-production

2012-04-18 Thread Johannes Schlüter
Commit:cc85e7c31391de9acdd348c947c9165520a924a2 Author:Johannes Schlüter Thu, 19 Apr 2012 00:08:36 +0200 Parents: 900751e8ae4ed2af3e63e7c355fac59f6f932254 710021d1d4a57941450b7ed482e3c19cfe62fecf Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a

[PHP-CVS] com php-src: Merge branch 'PHP-5.4': php.ini-development php.ini-production

2012-04-18 Thread Johannes Schlüter
Commit:9ca4710c9fb09bca31726e902e2eedab6c6abc94 Author:Johannes Schlüter Thu, 19 Apr 2012 00:08:42 +0200 Parents: f3b3450f010a8368a142034cef56fbab7f26212e cc85e7c31391de9acdd348c947c9165520a924a2 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Drop old README: README.Zeus

2012-04-18 Thread Johannes Schlüter
Commit:4650b2164b641ba3fd9d733e8cc82e386aa98772 Author:Johannes Schlüter Thu, 19 Apr 2012 00:29:24 +0200 Parents: 710021d1d4a57941450b7ed482e3c19cfe62fecf Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Commit generated file: ext/pdo/pdo_sql_parser.c

2012-04-19 Thread Johannes Schlüter
Commit:c06ec6bde43a114af3bd84e986827839de1b1e4b Author:Johannes Schlüter Thu, 19 Apr 2012 12:47:09 +0200 Parents: 1b78aef426a8f413ddd70854eb3fd5fbc95ef675 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Fix bug #61755 parsing bug can lead to access violations: NEWS ext/pdo/pdo_sql_parser.re ext/pdo_mysql/tests/bug_61755.phpt

2012-04-19 Thread Johannes Schlüter
Commit:1b78aef426a8f413ddd70854eb3fd5fbc95ef675 Author:Johannes Schlüter Thu, 19 Apr 2012 12:46:02 +0200 Parents: adfb4c62b76ef241978814e10cae70498f52ea29 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Fix folding: ext/mysqlnd/mysqlnd.c

2012-04-21 Thread Johannes Schlüter
Commit:bb2f8065344c8a7084ff9cccbbcb0321da08fb93 Author:Johannes Schlüter Sun, 22 Apr 2012 02:25:02 +0200 Parents: 36a556546737c5218cd649c9a5ae8b1a10aa2d49 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] tag php-src: create tag php-5.3.11

2012-04-24 Thread Johannes Schlüter
Tag php-5.3.11 in php-src.git was created Tag: de18abd1b84c95d4119e03c12f2bf03cb672c988 Tagger: Johannes Schlüter Wed Apr 25 00:16:11 2012 +0200 Log: PHP 5.3.11 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJPlyY5AAoJEH3sTmn8nIPXsWYH/3fClEyuAFHk

[PHP-CVS] com php-src: PHP 5.3.11: NEWS configure.in main/php_version.h

2012-04-24 Thread Johannes Schlüter
Commit:704bbb3263d0ec9a6b4a767bbc516e55388f4b0e Author:Johannes Schlüter Wed, 25 Apr 2012 00:13:15 +0200 Parents: b9562b3085f4e856836779e07060ca8efddd21d0 Branches: PHP-5.3.11 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Fix for CVE-2012-1823: sapi/cgi/cgi_main.c

2012-05-03 Thread Johannes Schlüter
Commit:29300b1f9dab068d477b241d8fd872e3a7c829b3 Author:Rasmus Lerdorf Thu, 3 May 2012 15:51:52 +0200 Committer: Johannes Schlüter Thu, 3 May 2012 15:51:52 +0200 Parents: 704bbb3263d0ec9a6b4a767bbc516e55388f4b0e Branches: PHP-5.3.12 Link: http://git.php.net/?p

[PHP-CVS] com php-src: PHP 5.3.12: NEWS configure.in main/php_version.h

2012-05-03 Thread Johannes Schlüter
Commit:03cb63bc1da6344f65a075f25721d29b59670cfe Author:Johannes Schlüter Thu, 3 May 2012 15:54:59 +0200 Parents: 29300b1f9dab068d477b241d8fd872e3a7c829b3 Branches: PHP-5.3.12 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] tag php-src: create tag php-5.3.12

2012-05-03 Thread Johannes Schlüter
Tag php-5.3.12 in php-src.git was created Tag: 215eedecc9223bfbd8572ae62423171176e6dac2 Tagger: Johannes Schlüter Thu May 3 15:55:11 2012 +0200 Log: PHP 5.3.12 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJPoo5JAAoJEH3sTmn8nIPXAbgH

[PHP-CVS] tag php-src: create tag php-5.3.13

2012-05-08 Thread Johannes Schlüter
Tag php-5.3.13 in php-src.git was created Tag: ce915805eb49518a83d8ce04eeca5f89e32a616c Tagger: Johannes Schlüter Tue May 8 11:22:55 2012 +0200 Log: PHP 5.3.13 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS

[PHP-CVS] com php-src: PHP 5.3.13: NEWS configure.in main/php_version.h

2012-05-08 Thread Johannes Schlüter
Commit:e9354b53665e2d313f07d48ce3d227cc61a068dc Author:Johannes Schlüter Tue, 8 May 2012 11:22:27 +0200 Parents: 46d9cc3de9f2def8ab84d0b83cc89b6f85d7506a Branches: PHP-5.3.13 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: improve fix for CVE-2012-1823 (cherry picked from commit fc3ba0552fd5c2d7b5870f3e2fec0a9a2d2996f4): sapi/cgi/cgi_main.c

2012-05-08 Thread Johannes Schlüter
Commit:46d9cc3de9f2def8ab84d0b83cc89b6f85d7506a Author:Stanislav Malyshev Mon, 7 May 2012 12:08:36 -0700 Committer: Johannes Schlüter Tue, 8 May 2012 11:15:23 +0200 Parents: 03cb63bc1da6344f65a075f25721d29b59670cfe Branches: PHP-5.3.13 Link: http://git.php.net

[PHP-CVS] com php-src: This will be PHP 5.3.14: NEWS configure.in main/php_version.h

2012-05-08 Thread Johannes Schlüter
Commit:e120a0c7f30953774d3ff2ac1a14b2ab623a047c Author:Johannes Schlüter Tue, 8 May 2012 11:28:15 +0200 Parents: 000e84aa88ce16deabbf61e7086fc8db63ca88aa Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Fix folding marks: ext/mysqlnd/mysqlnd_plugin.c

2012-05-08 Thread Johannes Schlüter
Commit:fb3b6bcf8384c375ddffce85d5e652ec609ccf7a Author:Johannes Schlüter Tue, 8 May 2012 15:18:33 +0200 Parents: 340091469a2838ee633764279d988e830f40acde Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Fix #61704 (Crash apache, phpinfo() threading issue): NEWS ext/mysqlnd/mysqlnd_plugin.c ext/mysqlnd/php_mysqlnd.c

2012-05-08 Thread Johannes Schlüter
Commit:e8e661128a4dcee9d2f35ed3443d567ba2ad7870 Author:Johannes Schlüter Tue, 8 May 2012 17:30:05 +0200 Parents: fb3b6bcf8384c375ddffce85d5e652ec609ccf7a Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: fix bug #61065 (cherry picked from commit a10e778bfb7ce9caa1f91666ddf2705db7982d68): ext/phar/tar.c

2012-05-16 Thread Johannes Schlüter
Commit:4eb802bb14b05b82573457bc0f528e61ca7ddc45 Author:Stanislav Malyshev Tue, 15 May 2012 22:34:34 -0700 Committer: Johannes Schlüter Wed, 16 May 2012 16:30:29 +0200 Parents: 93c91c733cf2259263e4d8c0f3ccc254246d404d Branches: PHP-5.3 PHP-5.4 master Link: http

[PHP-CVS] com php-src: PHP 5.3.15-dev: NEWS configure.in main/php_version.h

2012-05-16 Thread Johannes Schlüter
Commit:72a9b595ca3e1bc07cf1aa51c91dcbc973f89d10 Author:Johannes Schlüter Wed, 16 May 2012 16:49:35 +0200 Parents: 67039363cd5f317d77fffb88efcda3ffc6cd5d3f Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: fd fix: NEWS ext/standard/php_fopen_wrapper.c

2012-05-16 Thread Johannes Schlüter
Commit:6e519895011ea3ef43ce62c1050e72337af94b79 Author:Stanislav Malyshev Tue, 15 May 2012 22:35:43 -0700 Committer: Johannes Schlüter Wed, 16 May 2012 16:35:16 +0200 Parents: 4eb802bb14b05b82573457bc0f528e61ca7ddc45 Branches: PHP-5.3 PHP-5.4 master Link: http

[PHP-CVS] tag php-src: create tag php-5.3.14RC1

2012-05-16 Thread Johannes Schlüter
Tag php-5.3.14RC1 in php-src.git was created Tag: 2f2ac720bc1742feba364a4d4cb10bdd8fe84175 Tagger: Johannes Schlüter Wed May 16 16:45:08 2012 +0200 Log: PHP 5.3.14RC1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJPs72IAAoJEH3sTmn8nIPXN+4H

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/com_dotnet/com_misc.c ext/com_dotnet/com_olechar.c ext/com_dotnet/com_persist.c ext/com_dotnet/com_typeinfo.c ext/com_dotnet/com_variant

2012-05-24 Thread Johannes Schlüter
Commit:3cd50ca714fcf346aaa51a2c01c996c9434a2455 Author:Johannes Schlüter Fri, 25 May 2012 00:23:51 +0200 Parents: 84b2c39920ff02c86a46eb9191c140a887938371 8fc9df3f67dc35bff019f538934322583fd5fefd Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a

[PHP-CVS] com php-src: Those changes are in 5.3.15: NEWS

2012-05-24 Thread Johannes Schlüter
Commit:cfea8e5d04168d296d75dec21f8f0f920f563f00 Author:Johannes Schlüter Fri, 25 May 2012 00:20:29 +0200 Parents: 6c9056ceb722e26ad26f443841f856ee56f8e0fc Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854): ext/phar/tar.c

2012-05-30 Thread Johannes Schlüter
Commit:fa05f038cb2cd9e9fa17efd2286c42dcb3e9aa05 Author:Stanislav Malyshev Mon, 28 May 2012 18:54:15 -0700 Committer: Johannes Schlüter Wed, 30 May 2012 21:37:28 +0200 Parents: a331f43f8cc8f2b9c23ddee95632b765e2e440e5 Branches: PHP-5.3 PHP-5.4 master Link: http

[PHP-CVS] tag php-src: create tag php-5.3.14RC2

2012-05-30 Thread Johannes Schlüter
Tag php-5.3.14RC2 in php-src.git was created Tag: 61db83e9086d3f593918311822d3b010871061a4 Tagger: Johannes Schlüter Wed May 30 21:46:57 2012 +0200 Log: PHP 5.3.14RC2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS

[PHP-CVS] com php-src: Fix bug #62186 readline fails to compile: NEWS ext/readline/readline.c

2012-05-30 Thread Johannes Schlüter
Commit:4283e8dc8abaf99e22cf6ecf2cff00378fe5 Author:Johannes Schlüter Thu, 31 May 2012 01:15:22 +0200 Parents: 9b98cf78651af55b85b094f30037b7a55cb7735e Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: PHP 5.3.14RC2: NEWS configure.in main/php_version.h

2012-05-30 Thread Johannes Schlüter
Commit:dd3fa4f89669702b7d9dbeccf2baa6b4c4be0e94 Author:Johannes Schlüter Wed, 30 May 2012 21:46:28 +0200 Parents: c208ad9ddbf712e20a8ce0c0930eb1684e06609a Branches: PHP-5.3.14 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854) (cherry picked from commit fa05f038cb2cd9e9fa17efd2286c42dcb3e9aa05): ext/phar/tar.c

2012-05-30 Thread Johannes Schlüter
Commit:e9e4819c1b7396c4ee1120685aadae84396ac820 Author:Stanislav Malyshev Mon, 28 May 2012 18:54:15 -0700 Committer: Johannes Schlüter Wed, 30 May 2012 21:39:01 +0200 Parents: 438e03a354996506833287e56443ca4fe5c38726 Branches: PHP-5.3.14 Link: http://git.php.net

[PHP-CVS] com php-src: Fixed bug #62082: ext/intl/locale/locale_methods.c ext/intl/tests/bug62082.phpt

2012-05-30 Thread Johannes Schlüter
Commit:095f7fc965d6eaec6915b0af5b29accfab1703b3 Author:Gustavo André dos Santos Lopes Wed, 23 May 2012 12:44:44 +0200 Committer: Johannes Schlüter Wed, 30 May 2012 21:27:44 +0200 Parents: 5ecabb302d39c71b20c81ced350a9d88153e700f Branches: PHP-5.3.14 Link: http

[PHP-CVS] com php-src: PHP 5.3.14RC1: NEWS configure.in main/php_version.h

2012-05-30 Thread Johannes Schlüter
Commit:5ecabb302d39c71b20c81ced350a9d88153e700f Author:Johannes Schlüter Wed, 16 May 2012 16:44:30 +0200 Parents: 6e519895011ea3ef43ce62c1050e72337af94b79 Branches: PHP-5.3.14 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: PHP 5.3.14: configure.in main/php_version.h

2012-06-13 Thread Johannes Schlüter
Commit:d41f74f0894deb18db13a43d56363d84f97dd237 Author:Johannes Schlüter Wed, 13 Jun 2012 10:18:44 +0200 Parents: 2b7a26128a83d6d6f0e0673ee06cc3a4485d8da5 Branches: PHP-5.3.14 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] tag php-src: create tag php-5.3.14

2012-06-13 Thread Johannes Schlüter
Tag php-5.3.14 in php-src.git was created Tag: 1ca7a0818cdde1dc8b707b01d6c88056705249bc Tagger: Johannes Schlüter Wed Jun 13 10:19:57 2012 +0200 Log: PHP 5.3.14 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS

[PHP-CVS] com php-src: Merge RC NEWS: NEWS

2012-06-13 Thread Johannes Schlüter
Commit:2b7a26128a83d6d6f0e0673ee06cc3a4485d8da5 Author:Johannes Schlüter Wed, 13 Jun 2012 10:17:01 +0200 Parents: dd3fa4f89669702b7d9dbeccf2baa6b4c4be0e94 Branches: PHP-5.3.14 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Merge PHP 5.3.14 NEWS: NEWS

2012-06-13 Thread Johannes Schlüter
Commit:26cb5706155347815cec5b2fb5af968e31fd55e3 Author:Johannes Schlüter Wed, 13 Jun 2012 10:35:58 +0200 Parents: f0d6059389c0d00e6fa4a890b69d422aab8c3b0d Branches: PHP-5.3 PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

Re: [PHP-CVS] com php-src: Revert "Add PBKDF2 support via openssl()": ext/openssl/openssl.c ext/openssl/php_openssl.h ext/openssl/tests/openssl_pkcs5_pbkdf2_hmac.phpt

2012-06-13 Thread Johannes Schlüter
Stas, this wasn't merged into master. I'm not sure whether it should be "NULL-merged" so the code is kept in master or whether it should be removed from master, too. johannes On Tue, 2012-06-12 at 18:22 +, Stanislav Malyshev wrote: > Commit:c7be96b08fb457f8a2b4e2a64f59437b230886c1 > Auth

[PHP-CVS] com php-src: Remove outdated and user-specific files: ext/phar/cgidebug ext/phar/package.php ext/phar/package.xml

2012-06-20 Thread Johannes Schlüter
Commit:d93892de7a56ef6312d923d63757c792e3acf522 Author:Johannes Schlüter Wed, 20 Jun 2012 19:46:32 +0200 Parents: 5d81fe6f12eaa35a9dd9b968bd778ce24d50fffa Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

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

2012-06-22 Thread Johannes Schlüter
Commit:af516750ff32f69c1df10155fa8ec0c9cc5b70ff Author:Johannes Schlüter Fri, 22 Jun 2012 12:50:30 +0200 Parents: 041dd77135c89af821b483a3c1f485bfaf6cfb50 055ecbc62878e86287d742c7246c21606cee8183 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a

[PHP-CVS] com php-src: Improve check for :memory: pseudo-filename in SQlite: ext/pdo_sqlite/sqlite_driver.c ext/sqlite3/sqlite3.c

2012-06-22 Thread Johannes Schlüter
Commit:055ecbc62878e86287d742c7246c21606cee8183 Author:Johannes Schlüter Fri, 22 Jun 2012 12:48:39 +0200 Parents: d93892de7a56ef6312d923d63757c792e3acf522 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Remove extra ;: ext/odbc/php_odbc.c ext/pdo_mysql/pdo_mysql.c ext/recode/recode.c ext/session/session.c ext/standard/browscap.c

2012-06-22 Thread Johannes Schlüter
Commit:a62d4e2c43a41a2864e9b38836170e2d4f34033f Author:Johannes Schlüter Fri, 22 Jun 2012 17:32:46 +0200 Parents: b8e946b02eac53f46cbfc8eefb5c91fb5b075c9d Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/odbc/php_odbc.c ext/pdo_mysql/pdo_mysql.c ext/session/session.c ext/standard/browscap.c

2012-06-22 Thread Johannes Schlüter
Commit:5e23a047acf7b27fff20381d460fcd699731e9a5 Author:Johannes Schlüter Fri, 22 Jun 2012 17:33:22 +0200 Parents: 4af92aca872d7463b671c037f9d3b782e22a7c9c a62d4e2c43a41a2864e9b38836170e2d4f34033f Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a

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

2012-06-22 Thread Johannes Schlüter
Commit:2418791731a2d4b983bccb73d8b8835044f66673 Author:Johannes Schlüter Fri, 22 Jun 2012 20:01:06 +0200 Parents: 5e23a047acf7b27fff20381d460fcd699731e9a5 84b1c568f4d593c2f415b05f3b1b8bd0465eec27 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a

[PHP-CVS] com php-src: Remove unneeded and outdated ChangeLog file: Zend/ChangeLog makedist

2012-06-22 Thread Johannes Schlüter
Commit:84b1c568f4d593c2f415b05f3b1b8bd0465eec27 Author:Johannes Schlüter Fri, 22 Jun 2012 20:00:20 +0200 Parents: a62d4e2c43a41a2864e9b38836170e2d4f34033f Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Fix memleak in CLI: sapi/cli/php_cli.c

2012-06-27 Thread Johannes Schlüter
Commit:bc0972e78daec4d7b7adccb7116f8ded2ca5044d Author:Johannes Schlüter Wed, 27 Jun 2012 11:42:43 +0200 Parents: ad2bee193d9850cac9e214e9293f4dc3cd77d857 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

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

2012-06-27 Thread Johannes Schlüter
Commit:9a86784859067eaca44cad7f8b4aea00e3ffe6b2 Author:Johannes Schlüter Wed, 27 Jun 2012 11:46:57 +0200 Parents: 7a0f4cfddef2761b5893ececc4682e0cbd90facc bc0972e78daec4d7b7adccb7116f8ded2ca5044d Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a

[PHP-CVS] tag php-src: create tag php-5.3.15RC1

2012-07-04 Thread Johannes Schlüter
Tag php-5.3.15RC1 in php-src.git was created Tag: 993575f6453be169bdea6375eabe8a42d5661415 Tagger: Johannes Schlüter Thu Jul 5 01:05:52 2012 +0200 Log: PHP 5.3.15RC1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJP9MxgAAoJEH3sTmn8nIPXY/MH

[PHP-CVS] com php-src: This wil be PHP 5.3.16: NEWS configure.in main/php_version.h

2012-07-04 Thread Johannes Schlüter
Commit:6b2b1952671c74056c3335ded8342a94d5df931f Author:Johannes Schlüter Thu, 5 Jul 2012 01:15:27 +0200 Parents: bcc87ba68ede7b90cd544ec0911bdbe5d844aa2a Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Revert change 3f3ad30c50: There shouldn't be new features in 5.3, especially not if they aren't in 5.4, too.: ext/json/json.c ext/json/php_json.h ext/json/tests/bug43941.phpt ex

2012-07-04 Thread Johannes Schlüter
Commit:bcc87ba68ede7b90cd544ec0911bdbe5d844aa2a Author:johannes Thu, 5 Jul 2012 00:55:47 +0200 Parents: d80ff391899f7aead3b9b9c6c084adba8a8203ba Branches: PHP-5.3 PHP-5.4 master PHP-5.3.15 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bcc87ba68ede7b90cd544ec0911

[PHP-CVS] com php-src: PHP 5.3.15RC1: NEWS configure.in main/php_version.h

2012-07-04 Thread Johannes Schlüter
Commit:1f6c43f0555038056c123945e6600c3a18ac2407 Author:johannes Thu, 5 Jul 2012 01:00:23 +0200 Parents: bcc87ba68ede7b90cd544ec0911bdbe5d844aa2a Branches: PHP-5.3.15 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1f6c43f0555038056c123945e6600c3a18ac2407 Log: PHP

[PHP-CVS] com php-src: PHP 5.3.15: NEWS configure.in main/php_version.h

2012-07-22 Thread Johannes Schlüter
Commit:c180a72112d59ea4a9aa974dec210420862af465 Author:Johannes Schlüter Fri, 13 Jul 2012 00:17:37 +0200 Parents: 1f6c43f0555038056c123945e6600c3a18ac2407 Branches: PHP-5.3.15 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: merge 5.3.15 NEWS: NEWS

2012-07-22 Thread Johannes Schlüter
Commit:ffa8461bfebebd8158cdb26ad5f3439c527545f7 Author:Johannes Schlüter Sun, 22 Jul 2012 22:45:39 +0200 Parents: 777b6679a41abe40c4211c2f2a906a5218680872 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: Fix Bug #62612 readline extension compilation fails: NEWS sapi/cli/config.m4

2012-07-22 Thread Johannes Schlüter
Commit:860b3ffe75a95f18ff3bf570c49c5004cb70cab1 Author:Johannes Schlüter Sun, 22 Jul 2012 23:28:32 +0200 Parents: 254d299d0768562d60a12af0b05678ec7bff94cb Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] svn: /SVNROOT/ global_avail

2012-07-24 Thread Johannes Schlüter
johannes Wed, 25 Jul 2012 00:10:14 + Revision: http://svn.php.net/viewvc?view=revision&revision=326802 Log: Give myself access to karma.git Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail

[PHP-CVS] com karma: Allow myself to do forced pushes.: hooks/pre-receive

2012-07-24 Thread Johannes Schlüter
Commit:870bde4b24538cf7b64f0dd01b630241c5a53109 Author:Johannes Schlüter Wed, 25 Jul 2012 02:08:05 +0200 Parents: d1884840e7108c098ce75e7bbe204fb77b5fc975 Branches: master Link: http://git.php.net/?p=karma.git;a=commitdiff;h=870bde4b24538cf7b64f0dd01b630241c5a53109

Re: [PHP-CVS] del php-src: .travis.yml LICENSE Makefile.gcov NEWS README.md UPGRADING UPGRADING.INTERNALS Zend/tests/bug18556.phpt Zend/tests/bug60738.phpt Zend/tests/bug61681.phpt Zend/tests/const_de

2012-07-24 Thread Johannes Schlüter
-25 at 00:15 +, Johannes Schlüter wrote: > Branch: PHP-5.4 > Deleted commits count: 2298 > User: Johannes Schlüter Wed, 25 Jul 2012 00:15:30 > + > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php --

[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] del php-src: .travis.yml LICENSE Makefile.gcov NEWS README.md UPGRADING UPGRADING.INTERNALS Zend/tests/bug18556.phpt Zend/tests/bug60738.phpt Zend/tests/bug61681.

2012-07-24 Thread Johannes Schlüter
On Tue, 2012-07-24 at 20:34 -0400, Sean Coates wrote: > > Use > > git reset --hard origin/PHP-5.4 > > to reset your local checkout to the current version on the server. > > It should be noted that when you `reset --hard`, you'll lose local > changes (including branch commits, except in the refl

[PHP-CVS] com karma: Fix error message: hooks/pre-receive

2012-07-24 Thread Johannes Schlüter
Commit:3f9aeb02ef1bde0d2f3c25c3a297bb872964c99a Author:Johannes Schlüter Wed, 25 Jul 2012 03:09:52 +0200 Parents: 870bde4b24538cf7b64f0dd01b630241c5a53109 Branches: master Link: http://git.php.net/?p=karma.git;a=commitdiff;h=3f9aeb02ef1bde0d2f3c25c3a297bb872964c99a

[PHP-CVS] com php-src: PHP 5.3.16: NEWS configure.in main/php_version.h

2012-08-15 Thread Johannes Schlüter
Commit:0843bcd6f6fdcf2a5eca92375fd72cda868eb54b Author:Johannes Schlüter Wed, 15 Aug 2012 19:05:42 +0200 Parents: 10642aa9e4f1eb694a8f7b514cc234cb24545744 Branches: PHP-5.3.16 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] tag php-src: create tag php-5.3.16

2012-08-15 Thread Johannes Schlüter
Tag php-5.3.16 in php-src.git was created Tag: 1e48644ec808ed2470f368a861f6dbe3d72ce966 Tagger: Johannes Schlüter Wed Aug 15 19:06:32 2012 +0200 Log: PHP 5.3.16 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJQK9cqAAoJEH3sTmn8nIPXtIoH

Re: [PHP-CVS] com php-src: Fixed defective cloning in ext/intl classes: NEWS ext/intl/dateformat/dateformat_class.c ext/intl/formatter/formatter_class.c ext/intl/msgformat/msgformat_class.c ext/intl/t

2012-08-29 Thread Johannes Schlüter
Hi, this wasn't merged properly in 5.4. I get an conflict: [PHP-5.4] $ git merge PHP-5.3 Auto-merging NEWS Auto-merging ext/intl/dateformat/dateformat_class.c Auto-merging ext/intl/formatter/formatter_class.c Auto-merging ext/intl/msgformat/msgformat_class.c Auto-merging ext/intl/tests/bug62915-2

[PHP-CVS] com php-src: fix NEWS after releses: NEWS

2012-09-12 Thread Johannes Schlüter
Commit:0cc0f73fc333649739ecb48eb20401e639be43ac Author:Johannes Schlüter Wed, 12 Sep 2012 23:35:05 +0200 Parents: f66642aae10fbf77d536a4a4ac68602124e41ae0 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] tag php-src: create tag php-5.3.17

2012-09-12 Thread Johannes Schlüter
Tag php-5.3.17 in php-src.git was created Tag: d8770d78a3b9ce3dcae28c7cb71ca206ed82ca9c Tagger: Johannes Schlüter Wed Sep 12 23:28:47 2012 +0200 Log: PHP 5.3.17 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJQUP6ZAAoJEH3sTmn8nIPXmVUH

[PHP-CVS] com php-src: Merge 5.3.16 NEWS in.: NEWS

2012-09-12 Thread Johannes Schlüter
Commit:602bb125c3af3942af9fd2bf72ec8bc4197e73bd Author:Johannes Schlüter Wed, 29 Aug 2012 12:33:55 +0200 Parents: 0410b4e60f6b4b3a105c0866b797dc47a58ec594 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

[PHP-CVS] com php-src: PHP 5.3.17: configure.in main/php_version.h

2012-09-12 Thread Johannes Schlüter
Commit:8244eea4951a30fa959a0e4c59224425f2f8865c Author:Johannes Schlüter Wed, 12 Sep 2012 23:27:16 +0200 Parents: f9e407ec415dc289f901416ac25dfb92c22a1462 Branches: PHP-5.3.17 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h

  1   2   3   4   5   6   7   8   9   >