granicus.if.org Git

Ferenc Kovacs [Sat, 3 May 2014 00:51:46 +0000 (02:51 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654

commit | commitdiff | tree

Ferenc Kovacs [Sat, 3 May 2014 00:50:37 +0000 (02:50 +0200)]

only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654

commit | commitdiff | tree

Adam Harvey [Fri, 2 May 2014 21:34:48 +0000 (14:34 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix mysqli build when building against libmysqlclient.

commit | commitdiff | tree

Adam Harvey [Fri, 2 May 2014 21:33:52 +0000 (14:33 -0700)]

Fix mysqli build when building against libmysqlclient.

commit | commitdiff | tree

Adam Harvey [Fri, 2 May 2014 17:26:18 +0000 (10:26 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix author name on the #63228 patch.

commit | commitdiff | tree

Adam Harvey [Fri, 2 May 2014 17:25:42 +0000 (10:25 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix author name on the #63228 patch.

commit | commitdiff | tree

Adam Harvey [Fri, 2 May 2014 17:23:09 +0000 (10:23 -0700)]

Fix author name on the #63228 patch.

commit | commitdiff | tree

Nikita Popov [Fri, 2 May 2014 10:52:44 +0000 (12:52 +0200)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Nikita Popov [Fri, 2 May 2014 10:48:43 +0000 (12:48 +0200)]

Fixed bug #67169: []= after_array_splice incorrect

This fixes a regression I introduced in beta 1.

commit | commitdiff | tree

Ferenc Kovacs [Fri, 2 May 2014 07:50:40 +0000 (09:50 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess.

commit | commitdiff | tree

Ferenc Kovacs [Fri, 2 May 2014 07:50:25 +0000 (09:50 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess.

commit | commitdiff | tree

Ferenc Kovacs [Fri, 2 May 2014 07:49:10 +0000 (09:49 +0200)]

Revert "show leaks in their own group"
using valgrind would be a bit too much for travis I guess.

This reverts commit ea60d79e23556deb0f72cf4111deefa0d9a55262.

commit | commitdiff | tree

Ferenc Kovacs [Fri, 2 May 2014 07:33:31 +0000 (09:33 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
show leaks in their own group

commit | commitdiff | tree

Ferenc Kovacs [Fri, 2 May 2014 07:33:08 +0000 (09:33 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
show leaks in their own group

commit | commitdiff | tree

Ferenc Kovacs [Fri, 2 May 2014 07:32:42 +0000 (09:32 +0200)]

show leaks in their own group

commit | commitdiff | tree

Adam Harvey [Thu, 1 May 2014 18:23:48 +0000 (11:23 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  Use the right path for the suggested PHP invocation in ext_skel.
  Changed to more understandable NEWS message
  one heading is enough

commit | commitdiff | tree

Adam Harvey [Thu, 1 May 2014 18:23:14 +0000 (11:23 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Use the right path for the suggested PHP invocation in ext_skel.

commit | commitdiff | tree

Adam Harvey [Thu, 1 May 2014 18:22:46 +0000 (11:22 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Use the right path for the suggested PHP invocation in ext_skel.

commit | commitdiff | tree

Adam Harvey [Thu, 1 May 2014 18:21:34 +0000 (11:21 -0700)]

Use the right path for the suggested PHP invocation in ext_skel.

Fixes bug #67160 (ext_skel outputs incorrect information).

commit | commitdiff | tree

Bob Weinand [Thu, 1 May 2014 15:10:00 +0000 (17:10 +0200)]

Changed to more understandable NEWS message

commit | commitdiff | tree

Ferenc Kovacs [Thu, 1 May 2014 14:38:06 +0000 (16:38 +0200)]

one heading is enough

commit | commitdiff | tree

Ferenc Kovacs [Thu, 1 May 2014 14:25:38 +0000 (16:25 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
add new NEWS block for alpha3

commit | commitdiff | tree

Ferenc Kovacs [Thu, 1 May 2014 14:24:49 +0000 (16:24 +0200)]

add new NEWS block for alpha3

commit | commitdiff | tree

Ferenc Kovacs [Thu, 1 May 2014 10:50:28 +0000 (12:50 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
XFAIL the leaking multibyte tests, we should really get to the bottom of this

commit | commitdiff | tree

Ferenc Kovacs [Thu, 1 May 2014 10:49:45 +0000 (12:49 +0200)]

XFAIL the leaking multibyte tests, we should really get to the bottom of this

commit | commitdiff | tree

Bob Weinand [Thu, 1 May 2014 10:30:46 +0000 (12:30 +0200)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Bob Weinand [Thu, 1 May 2014 10:27:38 +0000 (12:27 +0200)]

Fixed numbering in UPGRADING file

commit | commitdiff | tree

Bob Weinand [Thu, 1 May 2014 09:47:28 +0000 (11:47 +0200)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Bob Weinand [Thu, 1 May 2014 09:46:35 +0000 (11:46 +0200)]

Updated NEWS for fixed phpdbg issue #85

commit | commitdiff | tree

Bob Weinand [Thu, 1 May 2014 09:38:08 +0000 (11:38 +0200)]

Added stdion/stdout/stderr constsnts and their php:// wrappers
Fixes issue #85

commit | commitdiff | tree

Bob Weinand [Thu, 1 May 2014 09:41:49 +0000 (11:41 +0200)]

commit | commitdiff | tree

Bob Weinand [Thu, 1 May 2014 09:38:08 +0000 (11:38 +0200)]

Added stdion/stdout/stderr constsnts and their php:// wrappers
Fixes issue #85

commit | commitdiff | tree

Ferenc Kovacs [Thu, 1 May 2014 08:57:12 +0000 (10:57 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing NEWS entry to the correct release where it was added
  5.5.12 was released yesterday
  add missing NEWS entry to the correct release where it was added
  add missing NEWS entry to the correct release where it was added

commit | commitdiff | tree

Ferenc Kovacs [Thu, 1 May 2014 08:56:39 +0000 (10:56 +0200)]

add missing NEWS entry to the correct release where it was added

commit | commitdiff | tree

Ferenc Kovacs [Thu, 1 May 2014 08:56:21 +0000 (10:56 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.5.12 was released yesterday
  add missing NEWS entry to the correct release where it was added
  add missing NEWS entry to the correct release where it was added

commit | commitdiff | tree

Ferenc Kovacs [Thu, 1 May 2014 08:54:15 +0000 (10:54 +0200)]

5.5.12 was released yesterday

commit | commitdiff | tree

Ferenc Kovacs [Thu, 1 May 2014 08:52:24 +0000 (10:52 +0200)]

add missing NEWS entry to the correct release where it was added

commit | commitdiff | tree

Ferenc Kovacs [Thu, 1 May 2014 08:52:13 +0000 (10:52 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add missing NEWS entry to the correct release where it was added

commit | commitdiff | tree

Bob Weinand [Thu, 1 May 2014 08:51:45 +0000 (10:51 +0200)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Bob Weinand [Thu, 1 May 2014 08:50:41 +0000 (10:50 +0200)]

Updated NEWS entry for phpdbg

commit | commitdiff | tree

Ferenc Kovacs [Thu, 1 May 2014 08:50:08 +0000 (10:50 +0200)]

add missing NEWS entry to the correct release where it was added

commit | commitdiff | tree

Ferenc Kovacs [Thu, 1 May 2014 08:44:31 +0000 (10:44 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
add some missing NEWS entries

commit | commitdiff | tree

Ferenc Kovacs [Thu, 1 May 2014 08:43:34 +0000 (10:43 +0200)]

add some missing NEWS entries

commit | commitdiff | tree

Michael Wallner [Wed, 30 Apr 2014 11:03:12 +0000 (13:03 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix test locality inconsitency

commit | commitdiff | tree

Michael Wallner [Wed, 30 Apr 2014 11:02:43 +0000 (13:02 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix test locality inconsitency

commit | commitdiff | tree

Michael Wallner [Wed, 30 Apr 2014 11:01:59 +0000 (13:01 +0200)]

fix test locality inconsitency

commit | commitdiff | tree

Michael Wallner [Wed, 30 Apr 2014 07:29:53 +0000 (09:29 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
BFN
fix bug #64247 (CURLOPT_INFILE doesn't allow reset)

commit | commitdiff | tree

Michael Wallner [Wed, 30 Apr 2014 07:29:37 +0000 (09:29 +0200)]

commit | commitdiff | tree

Michael Wallner [Wed, 30 Apr 2014 07:28:21 +0000 (09:28 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix bug #64247 (CURLOPT_INFILE doesn't allow reset)

commit | commitdiff | tree

Michael Wallner [Wed, 30 Apr 2014 07:26:50 +0000 (09:26 +0200)]

fix bug #64247 (CURLOPT_INFILE doesn't allow reset)

commit | commitdiff | tree

Ferenc Kovacs [Tue, 29 Apr 2014 22:08:38 +0000 (00:08 +0200)]

Merge remote-tracking branch 'origin/PHP-5.6'

* origin/PHP-5.6:
  Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros
  separate travis jobs for debug and non-debug builds
  separate travis jobs for TS and NTS builds
  put this test back to XFAIL, as it was before, since it is still leaking memory

commit | commitdiff | tree

Ferenc Kovacs [Tue, 29 Apr 2014 22:07:49 +0000 (00:07 +0200)]

Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6

* origin/PHP-5.5:
  separate travis jobs for debug and non-debug builds
  separate travis jobs for TS and NTS builds
  put this test back to XFAIL, as it was before, since it is still leaking memory

Conflicts:
ext/mbstring/tests/zend_multibyte-08.phpt

commit | commitdiff | tree

Ferenc Kovacs [Tue, 29 Apr 2014 21:34:10 +0000 (23:34 +0200)]

Merge remote-tracking branch 'tyrael/more_travis' into PHP-5.5

* tyrael/more_travis:
  separate travis jobs for debug and non-debug builds
  separate travis jobs for TS and NTS builds
  put this test back to XFAIL, as it was before, since it is still leaking memory

commit | commitdiff | tree

Bob Weinand [Tue, 29 Apr 2014 18:43:58 +0000 (20:43 +0200)]

Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros

commit | commitdiff | tree

Stanislav Malyshev [Tue, 29 Apr 2014 16:17:10 +0000 (09:17 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix bug #67060: use default mode of 660

commit | commitdiff | tree

Stanislav Malyshev [Tue, 29 Apr 2014 16:15:49 +0000 (09:15 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug #67060: use default mode of 660

commit | commitdiff | tree

Stanislav Malyshev [Tue, 29 Apr 2014 16:14:40 +0000 (09:14 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #67060: use default mode of 660

commit | commitdiff | tree

Stanislav Malyshev [Tue, 15 Apr 2014 17:43:24 +0000 (10:43 -0700)]

Fix bug #67060: use default mode of 660

commit | commitdiff | tree

Ferenc Kovacs [Mon, 28 Apr 2014 06:31:02 +0000 (08:31 +0200)]

separate travis jobs for debug and non-debug builds

commit | commitdiff | tree

Ferenc Kovacs [Sun, 27 Apr 2014 15:52:59 +0000 (17:52 +0200)]

separate travis jobs for TS and NTS builds

commit | commitdiff | tree

Ferenc Kovacs [Sun, 27 Apr 2014 20:23:43 +0000 (22:23 +0200)]

put this test back to XFAIL, as it was before, since it is still leaking memory

commit | commitdiff | tree

Anatol Belski [Tue, 29 Apr 2014 11:47:38 +0000 (13:47 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #66431 Special Character via COM Interface (CP_UTF8)

commit | commitdiff | tree

Anatol Belski [Tue, 29 Apr 2014 11:47:09 +0000 (13:47 +0200)]

commit | commitdiff | tree

Anatol Belski [Tue, 29 Apr 2014 11:46:38 +0000 (13:46 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated NEWS
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)

commit | commitdiff | tree

Anatol Belski [Tue, 29 Apr 2014 11:46:03 +0000 (13:46 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)

commit | commitdiff | tree

Anatol Belski [Tue, 29 Apr 2014 11:44:54 +0000 (13:44 +0200)]

commit | commitdiff | tree

Anatol Belski [Tue, 29 Apr 2014 11:40:44 +0000 (13:40 +0200)]

Fixed bug #66431 Special Character via COM Interface (CP_UTF8)

commit | commitdiff | tree

Popa Adrian Marius [Mon, 28 Apr 2014 09:15:53 +0000 (12:15 +0300)]

Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/push/php-src:
enable gmp for tests

commit | commitdiff | tree

Popa Adrian Marius [Mon, 28 Apr 2014 09:15:16 +0000 (12:15 +0300)]

Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6

* 'PHP-5.6' of https://git.php.net/push/php-src:
Fix crashes in GMP serialize/unserialize
enable gmp for tests

commit | commitdiff | tree

Popa Adrian Marius [Mon, 28 Apr 2014 09:14:39 +0000 (12:14 +0300)]

Merge branch 'master' of https://git.php.net/push/php-src

* 'master' of https://git.php.net/push/php-src:
Fix crashes in GMP serialize/unserialize
enable gmp for tests

commit | commitdiff | tree

Popa Adrian Marius [Mon, 28 Apr 2014 09:14:12 +0000 (12:14 +0300)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Cleanup ZEND_MODULE_API_NO => 20050922

commit | commitdiff | tree

Popa Adrian Marius [Mon, 28 Apr 2014 09:14:01 +0000 (12:14 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Cleanup ZEND_MODULE_API_NO => 20050922

commit | commitdiff | tree

Popa Adrian Marius [Mon, 28 Apr 2014 09:13:44 +0000 (12:13 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Cleanup ZEND_MODULE_API_NO => 20050922

commit | commitdiff | tree

Popa Adrian Marius [Mon, 28 Apr 2014 09:13:11 +0000 (12:13 +0300)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Cleanup ZEND_MODULE_API_NO => 20050922

commit | commitdiff | tree

Popa Adrian Marius [Mon, 28 Apr 2014 09:12:52 +0000 (12:12 +0300)]

Cleanup ZEND_MODULE_API_NO => 20050922

commit | commitdiff | tree

Stanislav Malyshev [Mon, 28 Apr 2014 08:23:39 +0000 (01:23 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix crashes in GMP serialize/unserialize
enable gmp for tests

commit | commitdiff | tree

Stanislav Malyshev [Mon, 28 Apr 2014 08:01:54 +0000 (01:01 -0700)]

Fix crashes in GMP serialize/unserialize

commit | commitdiff | tree

Stanislav Malyshev [Mon, 28 Apr 2014 07:57:47 +0000 (00:57 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
enable gmp for tests

commit | commitdiff | tree

Stanislav Malyshev [Mon, 28 Apr 2014 07:55:51 +0000 (00:55 -0700)]

enable gmp for tests

commit | commitdiff | tree

Anatol Belski [Sun, 27 Apr 2014 16:02:07 +0000 (18:02 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
C89 compat

commit | commitdiff | tree

Anatol Belski [Sun, 27 Apr 2014 16:01:26 +0000 (18:01 +0200)]

Merge remote-tracking branch 'phpdbg/master' into PHP-5.6

* phpdbg/master:
C89 compat

commit | commitdiff | tree

Anatol Belski [Sun, 27 Apr 2014 15:57:38 +0000 (17:57 +0200)]

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 22:17:09 +0000 (00:17 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 22:15:32 +0000 (00:15 +0200)]

Merge remote-tracking branch 'phpdbg/master' into PHP-5.6

* phpdbg/master:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 22:07:13 +0000 (00:07 +0200)]

removed /EHa as __try/__catch syntax is used anyway

see http://msdn.microsoft.com/en-us/library/1deeycx5.aspx

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 20:33:28 +0000 (22:33 +0200)]

fix ZEND_DEBUG usage

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 15:40:46 +0000 (17:40 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fixed test

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 15:40:33 +0000 (17:40 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fixed test