]> granicus.if.org Git - php/log
php
10 years agoCleanup IS_VAR handling
Dmitry Stogov [Wed, 27 Aug 2014 15:10:29 +0000 (19:10 +0400)]
Cleanup IS_VAR handling

10 years agoFixed corruption of execute_data when ZEND_STRLEN has to cast an object to string.
Tjerk Meesters [Wed, 27 Aug 2014 14:59:18 +0000 (22:59 +0800)]
Fixed corruption of execute_data when ZEND_STRLEN has to cast an object to string.

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Wed, 27 Aug 2014 10:11:59 +0000 (12:11 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed DBG_INF macro name
  reworked NEWS for 5.6.0GA

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Wed, 27 Aug 2014 10:11:35 +0000 (12:11 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed DBG_INF macro name

10 years agofixed DBG_INF macro name
Anatol Belski [Wed, 27 Aug 2014 10:10:35 +0000 (12:10 +0200)]
fixed DBG_INF macro name

10 years agoImproved performance of json_encode()
Dmitry Stogov [Wed, 27 Aug 2014 09:37:54 +0000 (13:37 +0400)]
Improved performance of json_encode()

10 years agoreworked NEWS for 5.6.0GA
Julien Pauli [Wed, 27 Aug 2014 08:47:44 +0000 (10:47 +0200)]
reworked NEWS for 5.6.0GA

10 years agoadd note about 'l' and zend_long
Anatol Belski [Wed, 27 Aug 2014 07:26:25 +0000 (09:26 +0200)]
add note about 'l' and zend_long

10 years agoIt should be int
Xinchen Hui [Wed, 27 Aug 2014 04:14:17 +0000 (12:14 +0800)]
It should be int

10 years agoFixed folder mark
Xinchen Hui [Wed, 27 Aug 2014 04:13:17 +0000 (12:13 +0800)]
Fixed folder mark

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Wed, 27 Aug 2014 02:53:22 +0000 (04:53 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix the NEWS

10 years agofix the NEWS
Ferenc Kovacs [Wed, 27 Aug 2014 02:51:24 +0000 (04:51 +0200)]
fix the NEWS

10 years agoMerge PHP RFC: Closure::call
Tjerk Meesters [Wed, 27 Aug 2014 02:28:16 +0000 (10:28 +0800)]
Merge PHP RFC: Closure::call

Commits:
  NEWS, UPGRADING
  Fixed Closure::apply() for int64
  Just return, no need for RETURN_NULL()
  Revert "Fixed closure::bindTo bad args test"
  Accuracy
  Fixed issues spotted by code review
  Comment clarification
  Old comment, whitespace
  Don't allow unbound scoped closures; make ->call used passed object as scope
  Removed unused variable
  Fixed and cleaned up implementaton of Closure::call() for phpng
  Fixed closure::bindTo bad args test
  Fixed unbound scoped closure edge cases and added tests for them
  Rename ::apply to ::call for the sake of JS consistency
  Added test for unbound_scoped
  Added optional bool param $unbound_scoped to Closure::bind and ::bindTo
  Implemented Closure::apply

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Wed, 27 Aug 2014 02:24:26 +0000 (04:24 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add the NEWS entries from the last stable release

10 years agoadd the NEWS entries from the last stable release
Ferenc Kovacs [Wed, 27 Aug 2014 02:23:55 +0000 (04:23 +0200)]
add the NEWS entries from the last stable release

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Wed, 27 Aug 2014 02:19:04 +0000 (04:19 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  almost forgot to bump this
  from now on, this should be 5.6.1-dev

10 years agoalmost forgot to bump this
Ferenc Kovacs [Wed, 27 Aug 2014 02:18:23 +0000 (04:18 +0200)]
almost forgot to bump this

10 years agofrom now on, this should be 5.6.1-dev
Ferenc Kovacs [Wed, 27 Aug 2014 02:14:23 +0000 (04:14 +0200)]
from now on, this should be 5.6.1-dev

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Wed, 27 Aug 2014 02:08:25 +0000 (04:08 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS to reflect what makes into 5.6.0 final

10 years agoupdate NEWS to reflect what makes into 5.6.0 final
Ferenc Kovacs [Wed, 27 Aug 2014 02:07:37 +0000 (04:07 +0200)]
update NEWS to reflect what makes into 5.6.0 final

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Wed, 27 Aug 2014 01:54:06 +0000 (03:54 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  remove the -dev suffix from the Zend version

Conflicts:
Zend/zend.h

10 years agoremove the -dev suffix from the Zend version
Ferenc Kovacs [Wed, 27 Aug 2014 01:52:46 +0000 (03:52 +0200)]
remove the -dev suffix from the Zend version

10 years agoNEWS, UPGRADING
Andrea Faulds [Wed, 27 Aug 2014 01:07:59 +0000 (02:07 +0100)]
NEWS, UPGRADING

10 years agoFixed Closure::apply() for int64
Andrea Faulds [Wed, 27 Aug 2014 01:05:50 +0000 (02:05 +0100)]
Fixed Closure::apply() for int64

10 years agoMerge branch 'master' into Closure_apply
Andrea Faulds [Wed, 27 Aug 2014 00:53:26 +0000 (01:53 +0100)]
Merge branch 'master' into Closure_apply

10 years agoFix zend_highlight functionality I broke
Nikita Popov [Tue, 26 Aug 2014 23:12:09 +0000 (01:12 +0200)]
Fix zend_highlight functionality I broke

Magic consts are not supposed to be highlighted as keywords.

10 years agoFix mbstring overloads in zts
Nikita Popov [Tue, 26 Aug 2014 22:53:24 +0000 (00:53 +0200)]
Fix mbstring overloads in zts

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Tue, 26 Aug 2014 22:48:26 +0000 (00:48 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update the GIT-RULES with the 5.6 and the release branches

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Tue, 26 Aug 2014 22:47:57 +0000 (00:47 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update the GIT-RULES with the 5.6 and the release branches

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Ferenc Kovacs [Tue, 26 Aug 2014 22:47:37 +0000 (00:47 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update the GIT-RULES with the 5.6 and the release branches

10 years agoupdate the GIT-RULES with the 5.6 and the release branches
Ferenc Kovacs [Tue, 26 Aug 2014 22:47:09 +0000 (00:47 +0200)]
update the GIT-RULES with the 5.6 and the release branches

10 years agoFix test with opcache/zts dependent output
Nikita Popov [Tue, 26 Aug 2014 22:31:20 +0000 (00:31 +0200)]
Fix test with opcache/zts dependent output

Refcount depends on whether array is immutablized and string is
interned.

10 years agoFix session handlers in zts
Nikita Popov [Tue, 26 Aug 2014 22:25:48 +0000 (00:25 +0200)]
Fix session handlers in zts

Also use ZEND_HASH_FOREACH API.

10 years agoFixed incorrect ZEND_INIT_FCALL_BY_NAME -> ZEND_INIT_FCALL conversion
Dmitry Stogov [Tue, 26 Aug 2014 21:39:39 +0000 (01:39 +0400)]
Fixed incorrect ZEND_INIT_FCALL_BY_NAME -> ZEND_INIT_FCALL conversion

10 years agoMove =&new deprecation message into compiler
Nikita Popov [Tue, 26 Aug 2014 20:53:41 +0000 (22:53 +0200)]
Move =&new deprecation message into compiler

10 years agoFix tokenizer test to not depend on specific token numbers
Nikita Popov [Tue, 26 Aug 2014 20:50:04 +0000 (22:50 +0200)]
Fix tokenizer test to not depend on specific token numbers

10 years agoHandle remaining magic constants in parser as well
Nikita Popov [Tue, 26 Aug 2014 20:47:11 +0000 (22:47 +0200)]
Handle remaining magic constants in parser as well

As far as I can see the !filename case cannot occur, so I dropped
it.

10 years agoSplit and optimize loop
Dmitry Stogov [Tue, 26 Aug 2014 20:52:50 +0000 (00:52 +0400)]
Split and optimize loop

10 years agoAdd backup_doc_comment production
Nikita Popov [Tue, 26 Aug 2014 20:30:18 +0000 (22:30 +0200)]
Add backup_doc_comment production

Bison can't detect the type of a mid-rule action, even if it accesses
$<str>$, so need to create a separate rule for this.

10 years agoeval() with parse error uses clean shutdown now
Nikita Popov [Tue, 26 Aug 2014 18:42:25 +0000 (20:42 +0200)]
eval() with parse error uses clean shutdown now

10 years agoAdd type annotations to parser
Nikita Popov [Thu, 21 Aug 2014 22:40:07 +0000 (00:40 +0200)]
Add type annotations to parser

Conflicts:

Zend/zend_language_parser.y

10 years agoDon't alloc empty jmp opnum list for single-branch if
Nikita Popov [Tue, 26 Aug 2014 17:39:40 +0000 (19:39 +0200)]
Don't alloc empty jmp opnum list for single-branch if

10 years agofixed bitset computing on win64 build
Anatol Belski [Tue, 26 Aug 2014 18:43:33 +0000 (20:43 +0200)]
fixed bitset computing on win64 build

10 years agoFixed zero-size allocation in debug build
Dmitry Stogov [Tue, 26 Aug 2014 17:32:20 +0000 (21:32 +0400)]
Fixed zero-size allocation in debug build

10 years agotemporary fix for win64
Anatol Belski [Tue, 26 Aug 2014 14:27:14 +0000 (16:27 +0200)]
temporary fix for win64

10 years agoReplaced Zend Memory Manager
Dmitry Stogov [Tue, 26 Aug 2014 12:21:58 +0000 (16:21 +0400)]
Replaced Zend Memory Manager

10 years agoFixed uint32_t overflow
Dmitry Stogov [Tue, 26 Aug 2014 11:57:19 +0000 (15:57 +0400)]
Fixed uint32_t overflow

10 years agoseveral signature and data type fixes
Anatol Belski [Tue, 26 Aug 2014 11:20:21 +0000 (13:20 +0200)]
several signature and data type fixes

10 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Tue, 26 Aug 2014 10:23:01 +0000 (14:23 +0400)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  fixed several long vs zend_long casts

10 years agoFixed return operand type (Use IS_TMP_VAR instead of IS_VAR in the same way as it...
Dmitry Stogov [Tue, 26 Aug 2014 10:22:03 +0000 (14:22 +0400)]
Fixed return operand type (Use IS_TMP_VAR instead of IS_VAR in the same way as it was before AST patch)

10 years agofixed several long vs zend_long casts
Anatol Belski [Tue, 26 Aug 2014 09:23:25 +0000 (11:23 +0200)]
fixed several long vs zend_long casts

10 years agoFixed compile-time constants substitution
Dmitry Stogov [Tue, 26 Aug 2014 09:06:19 +0000 (13:06 +0400)]
Fixed compile-time constants substitution

10 years agoregenerated date parsers
Anatol Belski [Tue, 26 Aug 2014 08:40:47 +0000 (10:40 +0200)]
regenerated date parsers

10 years agofix typo
Anatol Belski [Tue, 26 Aug 2014 08:04:51 +0000 (10:04 +0200)]
fix typo

10 years agoimplement #67886
Julien Pauli [Mon, 25 Aug 2014 16:32:40 +0000 (18:32 +0200)]
implement #67886

10 years agorenamed macro
Anatol Belski [Tue, 26 Aug 2014 07:55:17 +0000 (09:55 +0200)]
renamed macro

10 years agoedit comment
Anatol Belski [Tue, 26 Aug 2014 07:52:22 +0000 (09:52 +0200)]
edit comment

10 years agosimplify zend_long defs even more
Anatol Belski [Tue, 26 Aug 2014 07:49:54 +0000 (09:49 +0200)]
simplify zend_long defs even more

10 years agomake timelib independent from zend_long
Anatol Belski [Tue, 26 Aug 2014 07:27:55 +0000 (09:27 +0200)]
make timelib independent from zend_long

10 years agoFixed incompatible pointer
Xinchen Hui [Tue, 26 Aug 2014 04:19:09 +0000 (12:19 +0800)]
Fixed incompatible pointer

10 years agoFixed incompatible pointer
Xinchen Hui [Tue, 26 Aug 2014 04:14:45 +0000 (12:14 +0800)]
Fixed incompatible pointer

10 years agoFixed incompatible pointer
Xinchen Hui [Tue, 26 Aug 2014 04:12:39 +0000 (12:12 +0800)]
Fixed incompatible pointer

10 years agoFixed incompatible pointer type (int64)
Xinchen Hui [Tue, 26 Aug 2014 04:11:28 +0000 (12:11 +0800)]
Fixed incompatible pointer type (int64)

10 years agoUnused variable
Xinchen Hui [Tue, 26 Aug 2014 03:50:42 +0000 (11:50 +0800)]
Unused variable

10 years agoUnused variable
Xinchen Hui [Tue, 26 Aug 2014 03:49:32 +0000 (11:49 +0800)]
Unused variable

10 years agoUnused variale
Xinchen Hui [Tue, 26 Aug 2014 03:48:59 +0000 (11:48 +0800)]
Unused variale

10 years agobetter heading for UPGRADING.INTERNALS
Ferenc Kovacs [Mon, 25 Aug 2014 22:34:36 +0000 (00:34 +0200)]
better heading for UPGRADING.INTERNALS

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Mon, 25 Aug 2014 22:33:38 +0000 (00:33 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  better heading for UPGRADING.INTERNALS

10 years agobetter heading for UPGRADING.INTERNALS
Ferenc Kovacs [Mon, 25 Aug 2014 22:31:36 +0000 (00:31 +0200)]
better heading for UPGRADING.INTERNALS

10 years agofix strtol call
Anatol Belski [Mon, 25 Aug 2014 22:24:38 +0000 (00:24 +0200)]
fix strtol call

10 years agoupdated UPGRADING.INTERNALS
Anatol Belski [Mon, 25 Aug 2014 22:13:37 +0000 (00:13 +0200)]
updated UPGRADING.INTERNALS

10 years agofix func argument type
Anatol Belski [Mon, 25 Aug 2014 21:50:30 +0000 (23:50 +0200)]
fix func argument type

10 years agogeneralize the zend_long stuff
Anatol Belski [Mon, 25 Aug 2014 21:28:08 +0000 (23:28 +0200)]
generalize the zend_long stuff

10 years agoRemove ZEND_ACC_INTERACTIVE and CG(interactive)
Nikita Popov [Mon, 25 Aug 2014 21:45:02 +0000 (23:45 +0200)]
Remove ZEND_ACC_INTERACTIVE and CG(interactive)

As far as I can discern these are leftovers of the interactive
shell implementation that was used before PHP 5.4. Now the readline
ext makes use of normal eval calls for this.

So, dropping these until there is evidence to the contrary, as they
currently wouldn't work anyway.

10 years agomake bp type uint32_t everywhere
Nikita Popov [Mon, 25 Aug 2014 21:17:36 +0000 (23:17 +0200)]
make bp type uint32_t everywhere

10 years agoFix compiler warnings
Nikita Popov [Mon, 25 Aug 2014 21:05:05 +0000 (23:05 +0200)]
Fix compiler warnings

10 years agoFix zend_longo_str
Nikita Popov [Mon, 25 Aug 2014 20:47:04 +0000 (22:47 +0200)]
Fix zend_longo_str

10 years agoAdd zend_string_equals and zend_string_equals_literal
Nikita Popov [Mon, 25 Aug 2014 20:40:58 +0000 (22:40 +0200)]
Add zend_string_equals and zend_string_equals_literal

10 years agoMerge branch 'ast' POST_AST_MERGE
Nikita Popov [Mon, 25 Aug 2014 19:59:30 +0000 (21:59 +0200)]
Merge branch 'ast'

Conflicts:
Zend/zend_compile.c

10 years agoMerge remote-tracking branch 'php-src/master' into ast
Nikita Popov [Mon, 25 Aug 2014 19:21:16 +0000 (21:21 +0200)]
Merge remote-tracking branch 'php-src/master' into ast

Conflicts:
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_globals.h
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_types.h

10 years agomaster renames phase 7 PRE_AST_MERGE
Anatol Belski [Mon, 25 Aug 2014 19:51:49 +0000 (21:51 +0200)]
master renames phase 7

10 years agomaster renames phase 6
Anatol Belski [Mon, 25 Aug 2014 19:26:42 +0000 (21:26 +0200)]
master renames phase 6

10 years agomaster renamings phase 5
Anatol Belski [Mon, 25 Aug 2014 19:20:44 +0000 (21:20 +0200)]
master renamings phase 5

10 years agomaster renames phase 4
Anatol Belski [Mon, 25 Aug 2014 18:57:25 +0000 (20:57 +0200)]
master renames phase 4

10 years agoMerge branch 'master' of git.php.net:php-src
Anatol Belski [Mon, 25 Aug 2014 18:23:14 +0000 (20:23 +0200)]
Merge branch 'master' of git.php.net:php-src

# By Daniel Lowrey
# Via Daniel Lowrey
* 'master' of git.php.net:php-src:
  Update NEWS
  Bug #67850: Build when OpenSSL compiled without SSLv3 support

10 years agomaster renames phase 3
Anatol Belski [Mon, 25 Aug 2014 18:22:49 +0000 (20:22 +0200)]
master renames phase 3

10 years agoMerge branch 'PHP-5.6'
Daniel Lowrey [Mon, 25 Aug 2014 17:51:03 +0000 (19:51 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Daniel Lowrey [Mon, 25 Aug 2014 17:50:02 +0000 (19:50 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update NEWS

10 years agoUpdate NEWS
Daniel Lowrey [Mon, 25 Aug 2014 17:47:35 +0000 (19:47 +0200)]
Update NEWS

10 years agoFix for C89
Nikita Popov [Mon, 25 Aug 2014 17:46:21 +0000 (19:46 +0200)]
Fix for C89

10 years agoMerge branch 'PHP-5.6'
Daniel Lowrey [Mon, 25 Aug 2014 17:35:01 +0000 (19:35 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #67850: Build when OpenSSL compiled without SSLv3 support

10 years agomaster renames phase 2
Anatol Belski [Mon, 25 Aug 2014 17:28:33 +0000 (19:28 +0200)]
master renames phase 2

10 years agomaster renames phase 1
Anatol Belski [Mon, 25 Aug 2014 17:24:55 +0000 (19:24 +0200)]
master renames phase 1

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Daniel Lowrey [Mon, 25 Aug 2014 16:16:38 +0000 (18:16 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #67850: Build when OpenSSL compiled without SSLv3 support

Conflicts:
ext/openssl/xp_ssl.c

10 years agoBug #67850: Build when OpenSSL compiled without SSLv3 support
Daniel Lowrey [Mon, 25 Aug 2014 15:28:09 +0000 (17:28 +0200)]
Bug #67850: Build when OpenSSL compiled without SSLv3 support

10 years agoMerge branch 'PHP-5.6'
Lior Kaplan [Sun, 24 Aug 2014 21:31:10 +0000 (00:31 +0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Lior Kaplan [Sun, 24 Aug 2014 21:30:40 +0000 (00:30 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Lior Kaplan [Sun, 24 Aug 2014 21:30:01 +0000 (00:30 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>

10 years agoBug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
Lior Kaplan [Sun, 24 Aug 2014 21:29:05 +0000 (00:29 +0300)]
Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>

10 years agobring back the logic to parse 64 bit props also in 32 bit build
Anatol Belski [Sun, 24 Aug 2014 09:48:57 +0000 (11:48 +0200)]
bring back the logic to parse 64 bit props also in 32 bit build