granicus.if.org Git

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

projects / php / log

commit | commitdiff | tree

Ard Biesheuvel [Fri, 21 Jun 2013 09:27:23 +0000 (11:27 +0200)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Ard Biesheuvel [Fri, 21 Jun 2013 09:26:37 +0000 (11:26 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_vm_def.h

commit | commitdiff | tree

Ard Biesheuvel [Fri, 21 Jun 2013 09:07:30 +0000 (11:07 +0200)]

Fix non-specialized executor build

Removed a couple of calls to FREE_OP2() that were left behind in
the handlers for break and continue opcodes after commit 7628da98

commit | commitdiff | tree

Pierre Joye [Thu, 20 Jun 2013 20:34:04 +0000 (22:34 +0200)]

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

commit | commitdiff | tree

Pierre Joye [Thu, 20 Jun 2013 20:32:52 +0000 (22:32 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
  fix #65070, bgcolor does not use the same format as the input image with imagerotate
  fix #65070, bgcolor does not use the same format as the input image with imagerotate
  Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
  Change the search in get_status_string() to correctly handle unknown codes.
  Update git rules (5.5 is stable, 5.3 sec only)
  skip test for bug #64936 when tokenizer not built
  Bump version
  Update credits
  Merge NEWS from PHP 5.4 branch
  Reorder NEWS for PHP 5.5.0 final

Conflicts:
configure.in
ext/gd/libgd/gd_interpolation.c
main/php_version.h

commit | commitdiff | tree

Pierre Joye [Thu, 20 Jun 2013 20:22:07 +0000 (22:22 +0200)]

fix #65070, bgcolor does not use the same format as the input image with imagerotate

commit | commitdiff | tree

Pierre Joye [Thu, 20 Jun 2013 20:19:53 +0000 (22:19 +0200)]

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

commit | commitdiff | tree

Pierre Joye [Thu, 20 Jun 2013 20:19:33 +0000 (22:19 +0200)]

fix #65070, bgcolor does not use the same format as the input image with imagerotate

commit | commitdiff | tree

Adam Harvey [Thu, 20 Jun 2013 16:43:00 +0000 (09:43 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
Change the search in get_status_string() to correctly handle unknown codes.

commit | commitdiff | tree

Adam Harvey [Thu, 20 Jun 2013 16:39:37 +0000 (09:39 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
Change the search in get_status_string() to correctly handle unknown codes.

commit | commitdiff | tree

Adam Harvey [Thu, 20 Jun 2013 16:34:21 +0000 (09:34 -0700)]

Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.

Specifically: php_cli_server_http_reponse_status_code_pair →
php_cli_server_http_response_status_code_pair.

commit | commitdiff | tree

Adam Harvey [Wed, 19 Jun 2013 18:32:37 +0000 (11:32 -0700)]

Change the search in get_status_string() to correctly handle unknown codes.

This previously used a buggy implementation of binary search that would loop
infinitely for unknown codes when searching in reason arrays of particular
sizes (such as the one we have at the moment). Since C provides bsearch(),
we'll just use that instead, since libc authors hopefully get this right.

There was also an additional bug that was masked by the first one: the design
was that an unknown code would result in get_status_string() returning NULL,
which would then result in a segfault in append_http_status_line(), since it
assumed that it would always receive a valid string pointer that could be
handed off to smart_str_appends_ex(). We'll now return a placeholder in that
case.

Fixes bug #65066 (Cli server not responsive when responding with 422 http
status code).

commit | commitdiff | tree

Ard Biesheuvel [Thu, 20 Jun 2013 15:26:05 +0000 (17:26 +0200)]

Fix non-specialized executor build

Removed a couple of calls to FREE_OP2() that were left behind in
the handlers for break and continue opcodes after commit 7628da98

commit | commitdiff | tree

Johannes Schlüter [Thu, 20 Jun 2013 09:57:56 +0000 (11:57 +0200)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Johannes Schlüter [Thu, 20 Jun 2013 09:57:10 +0000 (11:57 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Johannes Schlüter [Thu, 20 Jun 2013 09:52:29 +0000 (11:52 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Johannes Schlüter [Thu, 20 Jun 2013 09:51:21 +0000 (11:51 +0200)]

Update git rules (5.5 is stable, 5.3 sec only)

commit | commitdiff | tree

Remi Collet [Thu, 20 Jun 2013 06:43:11 +0000 (08:43 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
skip test for bug #64936 when tokenizer not built

commit | commitdiff | tree

Remi Collet [Thu, 20 Jun 2013 06:42:30 +0000 (08:42 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
skip test for bug #64936 when tokenizer not built

commit | commitdiff | tree

Remi Collet [Thu, 20 Jun 2013 06:42:07 +0000 (08:42 +0200)]

skip test for bug #64936 when tokenizer not built

commit | commitdiff | tree

David Soria Parra [Wed, 19 Jun 2013 20:14:08 +0000 (22:14 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
  Bump version
  Update credits
  Merge NEWS from PHP 5.4 branch
  Reorder NEWS for PHP 5.5.0 final

commit | commitdiff | tree

David Soria Parra [Wed, 19 Jun 2013 20:11:52 +0000 (22:11 +0200)]

Bump version

commit | commitdiff | tree

David Soria Parra [Wed, 19 Jun 2013 20:03:02 +0000 (22:03 +0200)]

Update credits

commit | commitdiff | tree

David Soria Parra [Wed, 19 Jun 2013 19:54:34 +0000 (21:54 +0200)]

Merge NEWS from PHP 5.4 branch

commit | commitdiff | tree

David Soria Parra [Wed, 19 Jun 2013 19:50:05 +0000 (21:50 +0200)]

Reorder NEWS for PHP 5.5.0 final

commit | commitdiff | tree

Pierre Joye [Wed, 19 Jun 2013 15:59:30 +0000 (17:59 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
add notes about opcache windows issue and migration from APC

commit | commitdiff | tree

Pierre Joye [Wed, 19 Jun 2013 15:57:08 +0000 (17:57 +0200)]

add notes about opcache windows issue and migration from APC

commit | commitdiff | tree

Anatol Belski [Wed, 19 Jun 2013 14:25:08 +0000 (16:25 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
added some tests based on bug #64395

commit | commitdiff | tree

Anatol Belski [Wed, 19 Jun 2013 14:24:30 +0000 (16:24 +0200)]

added some tests based on bug #64395

commit | commitdiff | tree

Johannes Schlüter [Wed, 19 Jun 2013 13:09:45 +0000 (15:09 +0200)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Johannes Schlüter [Wed, 19 Jun 2013 13:09:33 +0000 (15:09 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Johannes Schlüter [Wed, 19 Jun 2013 13:09:04 +0000 (15:09 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Johannes Schlüter [Wed, 19 Jun 2013 13:08:02 +0000 (15:08 +0200)]

This will be PHP 5.3.28

commit | commitdiff | tree

Remi Collet [Wed, 19 Jun 2013 10:27:12 +0000 (12:27 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Related to bug #65047 (Test skip on client / server version)

commit | commitdiff | tree

Remi Collet [Wed, 19 Jun 2013 10:26:53 +0000 (12:26 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Related to bug #65047 (Test skip on client / server version)

commit | commitdiff | tree

Remi Collet [Wed, 19 Jun 2013 10:26:21 +0000 (12:26 +0200)]

Related to bug #65047 (Test skip on client / server version)

bug46274.phpt and bug46274_2.phpt
Make query silent (when server don't know bytea_output option)

bug_49985.phpt
Make result "locale" independent

commit | commitdiff | tree

Matteo Beccati [Wed, 19 Jun 2013 09:53:21 +0000 (11:53 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #65047 (Test skip on client / server version)
  Remove broken client version checking
  Clean up leftover file after the test

commit | commitdiff | tree

Matteo Beccati [Wed, 19 Jun 2013 09:53:05 +0000 (11:53 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #65047 (Test skip on client / server version)
  Remove broken client version checking
  Clean up leftover file after the test

commit | commitdiff | tree

Matteo Beccati [Wed, 19 Jun 2013 09:46:11 +0000 (11:46 +0200)]

Fixed bug #65047 (Test skip on client / server version)

commit | commitdiff | tree

Matteo Beccati [Wed, 19 Jun 2013 06:34:48 +0000 (08:34 +0200)]

Remove broken client version checking

commit | commitdiff | tree

Matteo Beccati [Wed, 19 Jun 2013 06:28:47 +0000 (08:28 +0200)]

Clean up leftover file after the test

commit | commitdiff | tree

Stanislav Malyshev [Wed, 19 Jun 2013 06:09:36 +0000 (23:09 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
sync NEWS

commit | commitdiff | tree

Stanislav Malyshev [Wed, 19 Jun 2013 06:09:29 +0000 (23:09 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
sync NEWS

commit | commitdiff | tree

Stanislav Malyshev [Wed, 19 Jun 2013 06:06:20 +0000 (23:06 -0700)]

sync NEWS

commit | commitdiff | tree

Stanislav Malyshev [Wed, 19 Jun 2013 05:59:34 +0000 (22:59 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
5.4.18 next

commit | commitdiff | tree

Stanislav Malyshev [Wed, 19 Jun 2013 05:59:26 +0000 (22:59 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
5.4.18 next

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Wed, 19 Jun 2013 05:58:11 +0000 (22:58 -0700)]

5.4.18 next

commit | commitdiff | tree

Xinchen Hui [Wed, 19 Jun 2013 03:17:55 +0000 (11:17 +0800)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Xinchen Hui [Wed, 19 Jun 2013 03:17:44 +0000 (11:17 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Wed, 19 Jun 2013 03:15:52 +0000 (11:15 +0800)]

Fix test typo

commit | commitdiff | tree

Nikita Popov [Mon, 17 Jun 2013 21:49:08 +0000 (23:49 +0200)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Nikita Popov [Mon, 17 Jun 2013 21:44:13 +0000 (23:44 +0200)]

Fix bug #65051: count() off by one inside unset()

nNumOfElements was incremented after the pDestructor code, so any
code in the dtor would get a wrong number of elements.

Right now the bucket deletion code is replicated in four places,
it should probably be moved off into one function (or rather,
zend_hash_apply_deleter should be used everywhere). The codes are
subtly different though in that the HANDLE_UNBLOCK_INTERRUPTIONS()
happens in different places. In particular it seems odd that in
some cases interruptions stay blocked during the destructor call.

commit | commitdiff | tree

Nikita Popov [Mon, 17 Jun 2013 16:51:59 +0000 (18:51 +0200)]

Remove unnecessary NULL checks from zend_hash

Our memory allocation functions (including the persistent ones)
are infallible, so no need to check for NULL.

commit | commitdiff | tree

Nikita Popov [Mon, 17 Jun 2013 16:27:22 +0000 (18:27 +0200)]

Update NEWS, UPGRADING and UPGRADING.INTERNALS

commit | commitdiff | tree

Nikita Popov [Mon, 17 Jun 2013 15:49:24 +0000 (17:49 +0200)]

GMP improvements

As per RFC https://wiki.php.net/rfc/operator_overloading_gmp

commit | commitdiff | tree

Nikita Popov [Mon, 17 Jun 2013 15:48:13 +0000 (17:48 +0200)]

Implement internal operator overloading

As pre RFC https://wiki.php.net/rfc/operator_overloading_gmp

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 08:07:28 +0000 (01:07 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Merge branch 'pull-request/320'
Merge branch 'pull-request/320'

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 08:06:28 +0000 (01:06 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Merge branch 'pull-request/320'

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 08:03:20 +0000 (01:03 -0700)]

Merge branch 'pull-request/320'

* pull-request/320:
  this is test 5 not 6
  fix race condition
  more shared names that create race conditions
  change to a unique filename
  more shared filenames
  yet another shared filename
  don't share a filename to stop race conditions
  fix race condition for 2-4 and normalize names for others
  fix race condition when running tests in parallel
  clean up after test
  Fix #64572: Clean up after the test
  Fix #64572: Clean up after the test

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 08:03:20 +0000 (01:03 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 07:42:36 +0000 (00:42 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Tests: PDO Mysql - update for fixed getColumnMeta()
fix bug #48724

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 07:41:46 +0000 (00:41 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Tests: PDO Mysql - update for fixed getColumnMeta()
fix bug #48724

commit | commitdiff | tree

Daniel Beardsley [Wed, 2 Jan 2013 17:55:23 +0000 (10:55 -0700)]

Tests: PDO Mysql - update for fixed getColumnMeta()

The test has always been disabled... so it's never run anyway. Oh well.

commit | commitdiff | tree

Antony Dovgal [Fri, 13 Apr 2012 09:59:52 +0000 (13:59 +0400)]

fix bug #48724

PDO's getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 07:17:28 +0000 (00:17 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
  readline can output control codes
  Bug #55694: Update readline test to support attempted_completion_over variable
  Bug #55694: Expose attempted_completion_over variable from readline library

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 07:15:59 +0000 (00:15 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  readline can output control codes
  Bug #55694: Update readline test to support attempted_completion_over variable
  Bug #55694: Expose attempted_completion_over variable from readline library

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 07:15:31 +0000 (00:15 -0700)]

readline can output control codes

commit | commitdiff | tree

Hartmel [Tue, 28 May 2013 07:59:43 +0000 (09:59 +0200)]

Bug #55694: Update readline test to support attempted_completion_over variable

commit | commitdiff | tree

Hartmel [Mon, 27 May 2013 15:49:06 +0000 (17:49 +0200)]

Bug #55694: Expose attempted_completion_over variable from readline library

commit | commitdiff | tree

Xinchen Hui [Mon, 17 Jun 2013 05:25:04 +0000 (13:25 +0800)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Xinchen Hui [Mon, 17 Jun 2013 05:23:24 +0000 (13:23 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Mon, 17 Jun 2013 05:22:20 +0000 (13:22 +0800)]

Fix typo in test

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 01:14:32 +0000 (18:14 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Identation Fixed
Identation Fixed

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 01:14:16 +0000 (18:14 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Identation Fixed

commit | commitdiff | tree

Jefersson Nathan [Mon, 1 Apr 2013 20:17:41 +0000 (17:17 -0300)]

Identation Fixed

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 01:13:26 +0000 (18:13 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Identation Fixed

commit | commitdiff | tree

Jefersson Nathan [Mon, 1 Apr 2013 20:17:41 +0000 (17:17 -0300)]

Identation Fixed

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:56:38 +0000 (16:56 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fix bug #64764: Add status option to fpm init.d script

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:55:18 +0000 (16:55 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #64764: Add status option to fpm init.d script

commit | commitdiff | tree

Lior Kaplan [Thu, 16 May 2013 16:46:53 +0000 (19:46 +0300)]

Fix bug #64764: Add status option to fpm init.d script

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:41:37 +0000 (16:41 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:41:23 +0000 (16:41 -0700)]

update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:40:56 +0000 (16:40 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
news for #64166

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:40:52 +0000 (16:40 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
news for #64166

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:40:39 +0000 (16:40 -0700)]

news for #64166

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:39:06 +0000 (16:39 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
  add more tests for bug #64166
  Move unsigned char declaration to top of block
  trailing ws
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:38:49 +0000 (16:38 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add more tests for bug #64166
  Move unsigned char declaration to top of block
  trailing ws
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:34:34 +0000 (16:34 -0700)]

add more tests for bug #64166

commit | commitdiff | tree

Michael M Slusarz [Mon, 18 Mar 2013 18:03:11 +0000 (12:03 -0600)]

Move unsigned char declaration to top of block

commit | commitdiff | tree

Michael M Slusarz [Mon, 18 Mar 2013 18:02:54 +0000 (12:02 -0600)]

trailing ws

commit | commitdiff | tree

Michael M Slusarz [Mon, 25 Feb 2013 01:34:35 +0000 (18:34 -0700)]

Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace

Second attempt: need to use lookaheadto determine whether to encode ws

commit | commitdiff | tree

Michael M Slusarz [Thu, 7 Feb 2013 19:37:52 +0000 (12:37 -0700)]

Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace

If trailing whitespace on a line is detected, mark the linebreak as a
soft linebreak.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 22:30:44 +0000 (15:30 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
ws fix

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 22:29:25 +0000 (15:29 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
ws fix

Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_language_scanner_defs.h

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 22:02:51 +0000 (15:02 -0700)]

Fix bug #64936 - clean doc comment state at the beginning and end of the scan

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 21:08:58 +0000 (14:08 -0700)]

ws fix

commit | commitdiff | tree

Anatol Belski [Sun, 16 Jun 2013 22:11:05 +0000 (00:11 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fix test

commit | commitdiff | tree

Anatol Belski [Sun, 16 Jun 2013 22:10:32 +0000 (00:10 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix test