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
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
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
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
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
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
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
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
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
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
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
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
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
=
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:
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://
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
-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
--
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
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
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
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
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
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
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
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
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 - 100 of 807 matches
Mail list logo