granicus.if.org Git

commit | commitdiff | tree

Nikita Popov [Thu, 11 Jun 2015 15:44:51 +0000 (17:44 +0200)]

Merge branch 'PHP-5.6'

Conflicts:
Zend/zend_generators.c

commit | commitdiff | tree

Nikita Popov [Thu, 11 Jun 2015 15:40:10 +0000 (17:40 +0200)]

commit | commitdiff | tree

Anatol Belski [Thu, 11 Jun 2015 15:07:24 +0000 (17:07 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
rework that test to allow delta for rounding errors

commit | commitdiff | tree

Anatol Belski [Thu, 11 Jun 2015 15:06:46 +0000 (17:06 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
rework that test to allow delta for rounding errors

commit | commitdiff | tree

Anatol Belski [Thu, 11 Jun 2015 15:05:03 +0000 (17:05 +0200)]

rework that test to allow delta for rounding errors

If this workout doesn't make travis happy, the patch needs to be
reviewed as the leak might still persist.

commit | commitdiff | tree

Anatol Belski [Thu, 11 Jun 2015 13:37:06 +0000 (15:37 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
improve test

commit | commitdiff | tree

Anatol Belski [Thu, 11 Jun 2015 13:36:30 +0000 (15:36 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
improve test

commit | commitdiff | tree

Anatol Belski [Thu, 11 Jun 2015 13:36:02 +0000 (15:36 +0200)]

commit | commitdiff | tree

Anatol Belski [Thu, 11 Jun 2015 10:08:09 +0000 (12:08 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
added test for bug #69646

commit | commitdiff | tree

Anatol Belski [Thu, 11 Jun 2015 10:07:32 +0000 (12:07 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
added test for bug #69646

commit | commitdiff | tree

Anatol Belski [Thu, 11 Jun 2015 10:06:59 +0000 (12:06 +0200)]

added test for bug #69646

commit | commitdiff | tree

Stanislav Malyshev [Thu, 11 Jun 2015 08:52:39 +0000 (01:52 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix bad copypaste

commit | commitdiff | tree

Stanislav Malyshev [Thu, 11 Jun 2015 08:52:23 +0000 (01:52 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix bad copypaste

commit | commitdiff | tree

Stanislav Malyshev [Thu, 11 Jun 2015 08:51:55 +0000 (01:51 -0700)]

commit | commitdiff | tree

Xinchen Hui [Thu, 11 Jun 2015 05:35:43 +0000 (13:35 +0800)]

Fixed Bug #69796 mysqli_stmt::fetch doesn't assign null values to bound variables

commit | commitdiff | tree

Xinchen Hui [Thu, 11 Jun 2015 04:53:56 +0000 (12:53 +0800)]

Fixed internal class flag restore

commit | commitdiff | tree

Dmitry Stogov [Wed, 10 Jun 2015 22:57:37 +0000 (01:57 +0300)]

Compile-time constant folding

commit | commitdiff | tree

Ferenc Kovacs [Wed, 10 Jun 2015 22:14:39 +0000 (00:14 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
make it possible to set the re2c and yacc paths via environment variables for genfiles

commit | commitdiff | tree

Ferenc Kovacs [Wed, 10 Jun 2015 22:13:40 +0000 (00:13 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
make it possible to set the re2c and yacc paths via environment variables for genfiles

commit | commitdiff | tree

Ferenc Kovacs [Wed, 10 Jun 2015 22:13:08 +0000 (00:13 +0200)]

make it possible to set the re2c and yacc paths via environment variables for genfiles

commit | commitdiff | tree

Márcio Almada [Tue, 9 Jun 2015 06:56:34 +0000 (03:56 -0300)]

fix bad formatted "undefined offset" notice when key is negative

commit | commitdiff | tree

Dmitry Stogov [Wed, 10 Jun 2015 19:25:24 +0000 (22:25 +0300)]

Fetch operands of opceodes for binary operators in certain order (from left to right).

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 14:43:33 +0000 (16:43 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  updated NEWS
  fix memory leak in pdo_pgsql closeCursor (bug 69752)

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 14:42:52 +0000 (16:42 +0200)]

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 14:41:33 +0000 (16:41 +0200)]

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 14:41:07 +0000 (16:41 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated NEWS
fix memory leak in pdo_pgsql closeCursor (bug 69752)

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 14:40:38 +0000 (16:40 +0200)]

commit | commitdiff | tree

Philip Hofstetter [Wed, 3 Jun 2015 12:56:02 +0000 (14:56 +0200)]

fix memory leak in pdo_pgsql closeCursor (bug 69752)

the parent PDO closeCursor method resets the pdo_stmt_t's executed flag
which is used by the postgres driver as a flag to check whether to
allocate memory for the column data or not.

This means that after the parent closeCursor() has been called, the
pdo_pgsql driver will allocate a new buffer for the columns, so the
existing buffer should be freed when the cursor is being closed.

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 11:17:10 +0000 (13:17 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
regenerated the ini scanner

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 11:16:29 +0000 (13:16 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
regenerated the ini scanner

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 11:15:01 +0000 (13:15 +0200)]

regenerated the ini scanner

follow up fix for bug #69551

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 09:27:24 +0000 (11:27 +0200)]

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 09:26:49 +0000 (11:26 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  updated NEWS
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
  Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 09:26:00 +0000 (11:26 +0200)]

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 09:25:21 +0000 (11:25 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
  Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 09:24:45 +0000 (11:24 +0200)]

commit | commitdiff | tree

Christian Wenz [Tue, 9 Jun 2015 08:40:36 +0000 (10:40 +0200)]

Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"

commit | commitdiff | tree

Christian Wenz [Tue, 9 Jun 2015 08:29:26 +0000 (10:29 +0200)]

Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""

This reverts commit 4a05c81b85336b76d05017cc86372fbd04871e3f.

commit | commitdiff | tree

Christian Wenz [Tue, 9 Jun 2015 08:05:27 +0000 (10:05 +0200)]

Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 08:47:06 +0000 (10:47 +0200)]

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 08:44:44 +0000 (10:44 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  updated NEWS
  fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
  made failing test more meaningful
  added failing test

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 08:44:02 +0000 (10:44 +0200)]

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 08:43:23 +0000 (10:43 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
  made failing test more meaningful
  added failing test

commit | commitdiff | tree

Anatol Belski [Wed, 10 Jun 2015 08:42:31 +0000 (10:42 +0200)]

commit | commitdiff | tree

Christoph M. Becker [Thu, 4 Jun 2015 00:40:05 +0000 (02:40 +0200)]

fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault

commit | commitdiff | tree

Christoph M. Becker [Thu, 4 Jun 2015 00:25:43 +0000 (02:25 +0200)]

made failing test more meaningful

commit | commitdiff | tree

Christoph M. Becker [Thu, 4 Jun 2015 00:16:25 +0000 (02:16 +0200)]

commit | commitdiff | tree

Ferenc Kovacs [Wed, 10 Jun 2015 07:39:38 +0000 (09:39 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
add missing NEWS entries
add missing NEWS entries

commit | commitdiff | tree

Ferenc Kovacs [Wed, 10 Jun 2015 07:37:00 +0000 (09:37 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
add missing NEWS entries

commit | commitdiff | tree

Ferenc Kovacs [Wed, 10 Jun 2015 07:36:53 +0000 (09:36 +0200)]

add missing NEWS entries

commit | commitdiff | tree

Ferenc Kovacs [Wed, 10 Jun 2015 07:35:38 +0000 (09:35 +0200)]

add missing NEWS entries

commit | commitdiff | tree

Stanislav Malyshev [Wed, 10 Jun 2015 04:39:59 +0000 (21:39 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  add NEWS
  Fixed bug #68776
  fix test
  update NEWS
  Fix bug #69646 OS command injection vulnerability in escapeshellarg
  Fix #69719 - more checks for nulls in paths
  fix test description
  Fixed Buf #68812 Unchecked return value.

Conflicts:
ext/dom/document.c
ext/gd/gd.c
ext/standard/exec.c

commit | commitdiff | tree

Stanislav Malyshev [Wed, 10 Jun 2015 04:37:17 +0000 (21:37 -0700)]

Fixed bug #69646 (OS command injection vulnerability in escapeshellarg)

commit | commitdiff | tree

Stanislav Malyshev [Wed, 10 Jun 2015 04:35:41 +0000 (21:35 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
add NEWS

commit | commitdiff | tree

Stanislav Malyshev [Wed, 10 Jun 2015 04:35:31 +0000 (21:35 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add NEWS

commit | commitdiff | tree

Stanislav Malyshev [Wed, 10 Jun 2015 04:35:18 +0000 (21:35 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Wed, 10 Jun 2015 04:34:06 +0000 (21:34 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #68776

commit | commitdiff | tree

Stanislav Malyshev [Wed, 10 Jun 2015 04:33:38 +0000 (21:33 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #68776

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 13 May 2015 00:18:46 +0000 (09:18 +0900)]

commit | commitdiff | tree

Stanislav Malyshev [Wed, 10 Jun 2015 00:12:25 +0000 (17:12 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix test
update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Wed, 10 Jun 2015 00:12:11 +0000 (17:12 -0700)]

Merge branch 'PHp-5.4' into PHP-5.5

* PHp-5.4:
fix test
update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Wed, 10 Jun 2015 00:11:33 +0000 (17:11 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Tue, 9 Jun 2015 23:23:05 +0000 (16:23 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Tue, 9 Jun 2015 22:32:27 +0000 (15:32 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #69646 OS command injection vulnerability in escapeshellarg
  Fix #69719 - more checks for nulls in paths
  fix test description
  Fixed Buf #68812 Unchecked return value.

commit | commitdiff | tree

Stanislav Malyshev [Tue, 9 Jun 2015 22:31:27 +0000 (15:31 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #69646 OS command injection vulnerability in escapeshellarg
  Fix #69719 - more checks for nulls in paths
  fix test description
  Fixed Buf #68812 Unchecked return value.

Conflicts:
ext/dom/document.c
ext/gd/gd.c

commit | commitdiff | tree

Ferenc Kovacs [Tue, 9 Jun 2015 21:14:11 +0000 (23:14 +0200)]

commit | commitdiff | tree

Stanislav Malyshev [Mon, 1 Jun 2015 05:53:35 +0000 (22:53 -0700)]

Fix bug #69646 OS command injection vulnerability in escapeshellarg

commit | commitdiff | tree

Stanislav Malyshev [Mon, 1 Jun 2015 05:47:52 +0000 (22:47 -0700)]

Fix #69719 - more checks for nulls in paths

commit | commitdiff | tree

Ferenc Kovacs [Tue, 9 Jun 2015 14:42:02 +0000 (16:42 +0200)]

fix hard-coded path in test

commit | commitdiff | tree

Ferenc Kovacs [Tue, 9 Jun 2015 12:20:55 +0000 (14:20 +0200)]

prepare for 7.0.0alpha1

commit | commitdiff | tree

Ferenc Kovacs [Tue, 9 Jun 2015 11:57:41 +0000 (13:57 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix NEWS

commit | commitdiff | tree

Ferenc Kovacs [Tue, 9 Jun 2015 11:57:28 +0000 (13:57 +0200)]

commit | commitdiff | tree

Ferenc Kovacs [Tue, 9 Jun 2015 11:41:25 +0000 (13:41 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
these will be part of 5.6.11

commit | commitdiff | tree

Ferenc Kovacs [Tue, 9 Jun 2015 11:39:21 +0000 (13:39 +0200)]

these will be part of 5.6.11

commit | commitdiff | tree

Ferenc Kovacs [Tue, 9 Jun 2015 11:32:11 +0000 (13:32 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
add missing NEWS entry

commit | commitdiff | tree

Ferenc Kovacs [Tue, 9 Jun 2015 11:31:45 +0000 (13:31 +0200)]

add missing NEWS entry

commit | commitdiff | tree

Julien Pauli [Tue, 9 Jun 2015 08:36:20 +0000 (10:36 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
5.5.27 now

commit | commitdiff | tree

Julien Pauli [Tue, 9 Jun 2015 08:35:42 +0000 (10:35 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
5.5.27 now

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Julien Pauli [Tue, 9 Jun 2015 08:29:29 +0000 (10:29 +0200)]

fix test description

Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test description
  Fixed Buf #68812 Unchecked return value.
  Fixed Buf #68812 Unchecked return value.

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix test description
Fixed Buf #68812 Unchecked return value.

fix test description

Merge branch 'PHP-5.6'

* PHP-5.6:
Upgrade bundled sqlite to 3.8.10.2

Fixed Buf #68812 Unchecked return value.

NEWS entry for: Upgrade bundled sqlite to 3.8.10.2

Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416

Fixed Buf #68812 Unchecked return value.

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Upgrade bundled sqlite to 3.8.10.2

NEWS entry for: Upgrade bundled sqlite to 3.8.10.2

Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS entry for: Upgrade bundled sqlite to 3.8.10.2
  Upgrade bundled sqlite to 3.8.10.2
  Add CVE used in PHP 5.4.39, 5.4.40, 5.4.41
  Add CVE to #68598

Upgrade bundled sqlite to 3.8.10.2

Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9

NEWS entry for: Upgrade bundled sqlite to 3.8.10.2

Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416

Upgrade bundled sqlite to 3.8.10.2

Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9

Add CVE used in PHP 5.4.39, 5.4.40, 5.4.41

commit | commitdiff | tree

Anatol Belski [Mon, 8 Jun 2015 11:28:53 +0000 (13:28 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fixed test related to fix for bug #67805

commit | commitdiff | tree

Anatol Belski [Mon, 8 Jun 2015 11:28:23 +0000 (13:28 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fixed test related to fix for bug #67805

commit | commitdiff | tree

Anatol Belski [Mon, 8 Jun 2015 11:27:22 +0000 (13:27 +0200)]