granicus.if.org Git - php/log

]> granicus.if.org Git - php/log

projects / php / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

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)]

BFN

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)]

updated NEWS

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)]

updated NEWS

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)]

C89 compat

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

commit | commitdiff | tree

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

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fixed test

commit | commitdiff | tree

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

fixed test

commit | commitdiff | tree

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

Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #67118 DateTime constructor crash with invalid data

commit | commitdiff | tree

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

updated NEWS

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated NEWS
Fixed bug #67118 DateTime constructor crash with invalid data

commit | commitdiff | tree

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

updated NEWS

commit | commitdiff | tree

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

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #67118 DateTime constructor crash with invalid data

commit | commitdiff | tree

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

Fixed bug #67118 DateTime constructor crash with invalid data

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Apr 2014 07:07:12 +0000 (00:07 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS
  update NEWS
  add a test case previously broken by a bad fix
  Revert "Fixed bug #64604"

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Apr 2014 07:00:49 +0000 (00:00 -0700)]

update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Apr 2014 07:00:20 +0000 (00:00 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  add a test case previously broken by a bad fix
  Revert "Fixed bug #64604"

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Apr 2014 07:00:01 +0000 (00:00 -0700)]

update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Apr 2014 06:59:32 +0000 (23:59 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add a test case previously broken by a bad fix
Revert "Fixed bug #64604"

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Apr 2014 06:58:38 +0000 (23:58 -0700)]

add a test case previously broken by a bad fix

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Apr 2014 06:49:52 +0000 (23:49 -0700)]

Revert "Fixed bug #64604"

This reverts commit b05c088a3abf8e4c6fb6e40418423a9e2dd3d929.
Breaks parsing urls where query has : in it, like: /foo/bar?baz=goo:boo

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 18:16:29 +0000 (20:16 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
updated libmagic.patch for 5.6+
updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 18:16:06 +0000 (20:16 +0200)]

updated libmagic.patch for 5.6+

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 18:15:01 +0000 (20:15 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 18:13:47 +0000 (20:13 +0200)]

updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 17:53:20 +0000 (19:53 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
backport this piece from 5.6, related to the #66307 fix

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 17:52:53 +0000 (19:52 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
backport this piece from 5.6, related to the #66307 fix

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 17:50:23 +0000 (19:50 +0200)]

backport this piece from 5.6, related to the #66307 fix

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 17:36:20 +0000 (19:36 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
updated NEWS
Fixed bug #66307 Fileinfo crashes with powerpoint files

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 17:35:52 +0000 (19:35 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 17:33:54 +0000 (19:33 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #66307 Fileinfo crashes with powerpoint files

Conflicts:
ext/fileinfo/libmagic/readcdf.c

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 17:30:34 +0000 (19:30 +0200)]

Fixed bug #66307 Fileinfo crashes with powerpoint files

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 11:15:16 +0000 (13:15 +0200)]

fix CFLAGS_PHPDBGS and some formatting

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 09:07:08 +0000 (11:07 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  use a portable strndup implementation
  fixed C89 compat
  prepare config.w32
  add parser files to dist

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 09:05:52 +0000 (11:05 +0200)]

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

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 09:01:54 +0000 (11:01 +0200)]

use a portable strndup implementation

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 09:00:36 +0000 (11:00 +0200)]

fixed C89 compat

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 08:58:30 +0000 (10:58 +0200)]

prepare config.w32

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 08:53:31 +0000 (10:53 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix dll export

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 08:52:59 +0000 (10:52 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix dll export

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 08:52:22 +0000 (10:52 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix dll export

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 08:51:42 +0000 (10:51 +0200)]

fix dll export

commit | commitdiff | tree

krakjoe [Thu, 24 Apr 2014 07:09:35 +0000 (08:09 +0100)]

add parser files to dist

commit | commitdiff | tree

Stanislav Malyshev [Tue, 22 Apr 2014 23:59:11 +0000 (16:59 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix accepting ill-formed UTF-8 characters

commit | commitdiff | tree

Stanislav Malyshev [Tue, 22 Apr 2014 23:57:47 +0000 (16:57 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix accepting ill-formed UTF-8 characters

commit | commitdiff | tree

Stanislav Malyshev [Tue, 22 Apr 2014 23:57:17 +0000 (16:57 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix accepting ill-formed UTF-8 characters

Conflicts:
ext/phar/phar_path_check.c

commit | commitdiff | tree

Jakub Zelenka [Mon, 21 Apr 2014 12:02:20 +0000 (13:02 +0100)]

Fix accepting ill-formed UTF-8 characters

Conflicts:
ext/phar/phar_path_check.c

commit | commitdiff | tree

Felipe Pena [Tue, 22 Apr 2014 13:49:18 +0000 (10:49 -0300)]

Merge branch 'PHP-5.6'

* PHP-5.6:
sapi/litespeed/lsapi_main.c: Fix bug #63228

commit | commitdiff | tree

George Wang [Fri, 12 Oct 2012 17:04:22 +0000 (13:04 -0400)]

sapi/litespeed/lsapi_main.c: Fix bug #63228

Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]

commit | commitdiff | tree

Bob Weinand [Mon, 21 Apr 2014 22:21:34 +0000 (00:21 +0200)]

Merge branch 'PHP-5.6'

Unnamed repository; edit this file 'description' to name the repository.