]> granicus.if.org Git - php/log
php
9 years agoFix #48147 - implement manual handling of //IGNORE for broken libc
Stanislav Malyshev [Fri, 8 May 2015 07:03:54 +0000 (00:03 -0700)]
Fix #48147 - implement manual handling of  //IGNORE for broken libc

9 years agorevert previously change to this
Xinchen Hui [Fri, 8 May 2015 02:33:19 +0000 (10:33 +0800)]
revert previously change to this

9 years agoImprove ZBLOCK handling with zlib < 1.2.4
Daniel Lowrey [Thu, 7 May 2015 14:26:56 +0000 (10:26 -0400)]
Improve ZBLOCK handling with zlib < 1.2.4

The original commit for this issue (62b1293) assumed Z_BLOCK was
only defined in < 1.2.4. However, this flush type *is* defined but
is only unavailable for use with deflate().

This new commit correctly checks the ZLIB_VERNUM constant to
determine if Z_BLOCK flush is available for the current deflate()
operation and triggers an appropriate error as needed.

New ZLIB_VERSION and ZLIB_VERNUM constants are also exposed in
userland to allow testing this behavior in environments running
zlib < 1.2.4 (ZLIB_VERNUM check is needed).

9 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Thu, 7 May 2015 14:27:29 +0000 (17:27 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Add some NEWS entries
  Allow self etc in eval / file scope
  fix typo in php.ini

9 years agoImproved fast path locality
Dmitry Stogov [Thu, 7 May 2015 14:26:35 +0000 (17:26 +0300)]
Improved fast path locality

9 years agoFixed $this release
Dmitry Stogov [Thu, 7 May 2015 14:26:01 +0000 (17:26 +0300)]
Fixed $this release

9 years agoMerge branch 'php-ini-typo' of https://github.com/lazysoundsystem/php-src
Xinchen Hui [Thu, 7 May 2015 14:24:21 +0000 (22:24 +0800)]
Merge branch 'php-ini-typo' of https://github.com/lazysoundsystem/php-src

9 years agoAdd some NEWS entries
Nikita Popov [Thu, 7 May 2015 13:37:46 +0000 (15:37 +0200)]
Add some NEWS entries

9 years agoAllow self etc in eval / file scope
Nikita Popov [Thu, 7 May 2015 13:17:37 +0000 (15:17 +0200)]
Allow self etc in eval / file scope

This fixes a regression from 16a9bc1ec20533c76ba992bfc64dd69e7b7d9001.
Together with the recent closure related changes this should allow
all usages of self etc, while previously (in PHP 5) some things like
self::class did not work.

9 years agoAvoid unnecessary reference counter incrementation on $this when call methods
Dmitry Stogov [Thu, 7 May 2015 13:28:23 +0000 (16:28 +0300)]
Avoid unnecessary reference counter incrementation on $this when call methods

9 years agoFix Z_BLOCK breakage when built against zlib < 1.2.4
Daniel Lowrey [Thu, 7 May 2015 13:02:30 +0000 (09:02 -0400)]
Fix Z_BLOCK breakage when built against zlib < 1.2.4

9 years agoMerge branch 'master' of git.php.net:php-src
Xinchen Hui [Thu, 7 May 2015 11:25:41 +0000 (19:25 +0800)]
Merge branch 'master' of git.php.net:php-src

9 years agoFixed test in some cases(for more children, needs more time)
Xinchen Hui [Thu, 7 May 2015 11:25:04 +0000 (19:25 +0800)]
Fixed test in some cases(for more children, needs more time)

9 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Thu, 7 May 2015 09:19:33 +0000 (12:19 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  set ext/zip version to 1.13 (as we have new methods... semver...)

9 years agoMerge branch 'PHP-5.6'
Dmitry Stogov [Thu, 7 May 2015 09:17:55 +0000 (12:17 +0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF)

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Dmitry Stogov [Thu, 7 May 2015 09:16:40 +0000 (12:16 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF)

Conflicts:
NEWS

9 years agoFixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF)
Dmitry Stogov [Thu, 7 May 2015 09:14:14 +0000 (12:14 +0300)]
Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF)

9 years agoset ext/zip version to 1.13 (as we have new methods... semver...)
Remi Collet [Thu, 7 May 2015 08:41:48 +0000 (10:41 +0200)]
set ext/zip version to 1.13 (as we have new methods... semver...)

9 years agoStrings and other pointers should be handled differently
Dmitry Stogov [Thu, 7 May 2015 08:36:01 +0000 (11:36 +0300)]
Strings and other pointers should be handled differently

9 years agoFixed redundand internal constructor behavior (they shouldn't return NULL anymore)
Dmitry Stogov [Thu, 7 May 2015 07:38:47 +0000 (10:38 +0300)]
Fixed redundand internal constructor behavior (they shouldn't return NULL anymore)

9 years agoFix build
Rasmus Lerdorf [Thu, 7 May 2015 05:46:56 +0000 (22:46 -0700)]
Fix build

9 years agoTemporary fix for SIGFPE
Xinchen Hui [Thu, 7 May 2015 03:25:04 +0000 (11:25 +0800)]
Temporary fix for SIGFPE

9 years agoAdded experimental (disabled by default) file based opcode cache.
Dmitry Stogov [Wed, 6 May 2015 20:46:49 +0000 (23:46 +0300)]
Added experimental (disabled by default) file based opcode cache.

9 years agoFixed return without value
Dmitry Stogov [Wed, 6 May 2015 19:53:48 +0000 (22:53 +0300)]
Fixed return without value

9 years agoFixed bug #69534 (Cycle leaks through declared properties on internal classes)
Dmitry Stogov [Wed, 6 May 2015 18:33:49 +0000 (21:33 +0300)]
Fixed bug #69534 (Cycle leaks through declared properties on internal classes)

9 years agoFix compiler assumptions about self/etc wrt closures
Nikita Popov [Tue, 5 May 2015 17:52:03 +0000 (19:52 +0200)]
Fix compiler assumptions about self/etc wrt closures

* Don't throw an error if self/parent/static are used in a closure
  (outside a class).
* Don't propagate self:: constants into closures
* Use runtime fetch for self::class in closures

Fixes bug #66811.

9 years agoDon't implicitly make closures in static methods static
Nikita Popov [Wed, 6 May 2015 15:29:05 +0000 (17:29 +0200)]
Don't implicitly make closures in static methods static

It makes no sense that you can't write a closure using $this in a
static method, even though you can write one outside a class.

Now only closures that have been marked as static will be considered
to be static.

Fixes bug #65598.

9 years agobetter fix (also fix i386 build)
Remi Collet [Wed, 6 May 2015 14:59:50 +0000 (16:59 +0200)]
better fix (also fix i386 build)

9 years agotry to fix build when LONG_MAX not defined
Remi Collet [Wed, 6 May 2015 14:24:21 +0000 (16:24 +0200)]
try to fix build when LONG_MAX not defined

9 years agoNEWS
Remi Collet [Wed, 6 May 2015 13:24:41 +0000 (15:24 +0200)]
NEWS

9 years agoadd ZipArchive::setCompressionName and ZipArchive::setCompressionIndex methods
Remi Collet [Wed, 6 May 2015 13:11:00 +0000 (15:11 +0200)]
add ZipArchive::setCompressionName and ZipArchive::setCompressionIndex methods

9 years agodon't use deprecated libzip call
Remi Collet [Wed, 6 May 2015 12:43:47 +0000 (14:43 +0200)]
don't use deprecated libzip call

9 years agoupdate libzip to version 1.0.1
Remi Collet [Wed, 6 May 2015 12:36:18 +0000 (14:36 +0200)]
update libzip to version 1.0.1

9 years agoUse fast zpp for frequently used gettext(_)
Xinchen Hui [Wed, 6 May 2015 06:29:19 +0000 (14:29 +0800)]
Use fast zpp for frequently used gettext(_)

9 years agoOptimized json_parser
Xinchen Hui [Wed, 6 May 2015 03:37:30 +0000 (11:37 +0800)]
Optimized json_parser

1. use zend_string in key
2. use faster APIs
3. use ZVAL_COPY_VALUE instead of assignment (save u2 copy)

9 years agoUse Z_ARRVAL_P since we already know it's an array
Xinchen Hui [Wed, 6 May 2015 03:10:33 +0000 (11:10 +0800)]
Use Z_ARRVAL_P since we already know it's an array

9 years agoFixed comment
Xinchen Hui [Wed, 6 May 2015 03:03:44 +0000 (11:03 +0800)]
Fixed comment

9 years agouse zval_get_long
Xinchen Hui [Wed, 6 May 2015 02:58:01 +0000 (10:58 +0800)]
use zval_get_long

9 years agoMerge branch 'master' of git.php.net:php-src
Xinchen Hui [Wed, 6 May 2015 02:51:52 +0000 (10:51 +0800)]
Merge branch 'master' of git.php.net:php-src

9 years agoFixed returning void instead of NULL
Dmitry Stogov [Tue, 5 May 2015 20:50:50 +0000 (23:50 +0300)]
Fixed returning void instead of NULL

9 years agoFix build
Nikita Popov [Tue, 5 May 2015 19:40:28 +0000 (21:40 +0200)]
Fix build

9 years agoFix LSB handling for closures
Nikita Popov [Tue, 5 May 2015 19:06:34 +0000 (21:06 +0200)]
Fix LSB handling for closures

Closures will now use the called_scope from their instantiation
site. If they are rebound either the class of $this is used or if
no $this is provided the bound scope is used.

With this change the scope for static closures can be changed back
to use EG(scope) rather than EX(called_scope), thus fixing
bug #69568.

9 years agoThrow exception from FETCH_CLASS_NAME
Nikita Popov [Tue, 5 May 2015 16:36:06 +0000 (18:36 +0200)]
Throw exception from FETCH_CLASS_NAME

Instead of empty strings.

This does not affect the existing case of __CLASS__ in traits as
a scope will always exists in that case.

9 years agoUse ZEND_FETCH_CLASS_NAME for dynamic self::class etc
Nikita Popov [Tue, 5 May 2015 16:22:20 +0000 (18:22 +0200)]
Use ZEND_FETCH_CLASS_NAME for dynamic self::class etc

Extend the opcode to support getting the parent and static name and
then use it for dynamic ::class resolution.

9 years agoUse Fast ZPP
Dmitry Stogov [Tue, 5 May 2015 18:38:52 +0000 (21:38 +0300)]
Use Fast ZPP

9 years agoLoop splitting and specialization
Dmitry Stogov [Tue, 5 May 2015 15:51:08 +0000 (18:51 +0300)]
Loop splitting and specialization

9 years agoMicro optimization
Dmitry Stogov [Tue, 5 May 2015 15:50:47 +0000 (18:50 +0300)]
Micro optimization

9 years agoFixed compilation warning
Dmitry Stogov [Tue, 5 May 2015 13:28:54 +0000 (16:28 +0300)]
Fixed compilation warning

9 years agoe more efficient zend_hash_*() functions
Dmitry Stogov [Tue, 5 May 2015 13:20:29 +0000 (16:20 +0300)]
e more efficient zend_hash_*() functions

9 years agoUse zend_string to represent pdo_column_data.name and avoid duplication.
Dmitry Stogov [Tue, 5 May 2015 13:19:51 +0000 (16:19 +0300)]
Use zend_string to represent pdo_column_data.name and avoid duplication.

9 years agoUse zend heap instead of system
Dmitry Stogov [Tue, 5 May 2015 13:06:10 +0000 (16:06 +0300)]
Use zend heap instead of system

9 years agomicro optimizations
Xinchen Hui [Tue, 5 May 2015 10:22:38 +0000 (18:22 +0800)]
micro optimizations

9 years agoUse better zend_hash_*() functions.
Dmitry Stogov [Tue, 5 May 2015 09:58:11 +0000 (12:58 +0300)]
Use better zend_hash_*() functions.

9 years agoRemoved check for count() in SXE class
Dmitry Stogov [Tue, 5 May 2015 09:57:30 +0000 (12:57 +0300)]
Removed check for count() in SXE class

9 years agofixed comment
Xinchen Hui [Tue, 5 May 2015 09:37:42 +0000 (17:37 +0800)]
fixed comment

9 years agoMerge branch 'PHP-5.6'
Remi Collet [Tue, 5 May 2015 09:37:03 +0000 (11:37 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Relax tests failing on i386 with new zic

Conflicts:
ext/date/tests/getdate_variation7.phpt
ext/date/tests/localtime_variation3.phpt

9 years agoUnused macros
Xinchen Hui [Tue, 5 May 2015 09:25:25 +0000 (17:25 +0800)]
Unused macros

9 years agoMerge branch 'master' of git.php.net:php-src
Xinchen Hui [Tue, 5 May 2015 09:24:17 +0000 (17:24 +0800)]
Merge branch 'master' of git.php.net:php-src

9 years agoOptimize cast simplexml to IS_BOOL
Xinchen Hui [Tue, 5 May 2015 09:23:54 +0000 (17:23 +0800)]
Optimize cast simplexml to IS_BOOL

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Tue, 5 May 2015 09:23:13 +0000 (11:23 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Relax tests failing on i386 with new zic

9 years agoRelax tests failing on i386 with new zic
Remi Collet [Tue, 5 May 2015 09:22:29 +0000 (11:22 +0200)]
Relax tests failing on i386 with new zic

9 years agoUnused var
Xinchen Hui [Tue, 5 May 2015 09:02:54 +0000 (17:02 +0800)]
Unused var

9 years agoMerge branch 'PHP-5.6'
Remi Collet [Tue, 5 May 2015 08:41:47 +0000 (10:41 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Remove SSLv3 test dependencies SSLv3 is going away. Debian8 already ships with an openssl with no SSLv3 support which was causing these tests to fail.

9 years agoRemove SSLv3 test dependencies
Rasmus Lerdorf [Wed, 8 Apr 2015 16:55:55 +0000 (09:55 -0700)]
Remove SSLv3 test dependencies
SSLv3 is going away. Debian8 already ships with an openssl
with no SSLv3 support which was causing these tests to fail.

Conflicts:
ext/openssl/tests/session_meta_capture.phpt

9 years agoAvoid repeatable lookups for count() method in the same class entry.
Dmitry Stogov [Tue, 5 May 2015 08:10:21 +0000 (11:10 +0300)]
Avoid repeatable lookups for count() method in the same class entry.

9 years agoInline IS_LONG value calculation and avoid strtol() call.
Dmitry Stogov [Tue, 5 May 2015 08:09:18 +0000 (11:09 +0300)]
Inline IS_LONG value calculation and avoid strtol() call.

9 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Tue, 5 May 2015 03:07:02 +0000 (11:07 +0800)]
Merge branch 'PHP-5.6'

Conflicts:
ext/opcache/ZendAccelerator.h

9 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Xinchen Hui [Tue, 5 May 2015 03:06:23 +0000 (11:06 +0800)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 5 May 2015 03:06:14 +0000 (11:06 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

9 years agoUpdate version
Xinchen Hui [Tue, 5 May 2015 03:06:04 +0000 (11:06 +0800)]
Update version

9 years agoadd config vars for phpize where conf opts aren't enabled
Anatol Belski [Mon, 4 May 2015 14:07:27 +0000 (16:07 +0200)]
add config vars for phpize where conf opts aren't enabled

9 years agoMerge branch 'PHP-5.6'
Anatol Belski [Mon, 4 May 2015 14:06:23 +0000 (16:06 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add config vars for phpize

9 years agoadd config vars for phpize
Anatol Belski [Mon, 4 May 2015 13:59:14 +0000 (15:59 +0200)]
add config vars for phpize

9 years agofix compiler check for phpize
Anatol Belski [Mon, 4 May 2015 13:13:27 +0000 (15:13 +0200)]
fix compiler check for phpize

9 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Mon, 4 May 2015 11:23:21 +0000 (19:23 +0800)]
Merge branch 'PHP-5.6'

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Mon, 4 May 2015 11:22:22 +0000 (19:22 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

9 years agoSaving the latter checking in most cases
Xinchen Hui [Mon, 4 May 2015 11:21:54 +0000 (19:21 +0800)]
Saving the latter checking in most cases

9 years agoFixed #69566 in master
Xinchen Hui [Mon, 4 May 2015 02:35:55 +0000 (10:35 +0800)]
Fixed #69566 in master

9 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Mon, 4 May 2015 02:34:57 +0000 (10:34 +0800)]
Merge branch 'PHP-5.6'

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Mon, 4 May 2015 02:34:48 +0000 (10:34 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

9 years agoUpdate NEWS
Xinchen Hui [Mon, 4 May 2015 02:34:39 +0000 (10:34 +0800)]
Update NEWS

9 years agoFix uninitialized value with extension traits
John Boehr [Sun, 3 May 2015 21:29:19 +0000 (14:29 -0700)]
Fix uninitialized value with extension traits

9 years agoFix uninitialized value with extension traits
John Boehr [Sun, 3 May 2015 21:29:19 +0000 (14:29 -0700)]
Fix uninitialized value with extension traits

9 years agoAdd unique prefix to exported function
Christopher Jones [Sat, 2 May 2015 17:03:30 +0000 (10:03 -0700)]
Add unique prefix to exported function

9 years agoFirst pass migrating PDO_OCI to PHP 7
Christopher Jones [Sat, 2 May 2015 01:22:41 +0000 (18:22 -0700)]
First pass migrating PDO_OCI to PHP 7

9 years agoExport free_statement to replace php_pdo_stmt_delref which was deleted in 9fe85313095...
Christopher Jones [Sat, 2 May 2015 01:17:34 +0000 (18:17 -0700)]
Export free_statement to replace php_pdo_stmt_delref which was deleted in 9fe853130951cff085907c0ac136edd31ec52288 along with php_pdo_stmt_addref

9 years agofix typo in php.ini
Andy Footner [Fri, 1 May 2015 10:38:07 +0000 (12:38 +0200)]
fix typo in php.ini

9 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Thu, 30 Apr 2015 05:31:06 +0000 (22:31 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Upgrade to PCRE 8.37 due to various bugfixes

Conflicts:
ext/pcre/config.w32
ext/pcre/config0.m4
ext/pcre/pcrelib/pcre_jit_compile.c
ext/pcre/pcrelib/sljit/sljitConfig.h
ext/pcre/pcrelib/sljit/sljitConfigInternal.h
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeARM_64.c
ext/pcre/pcrelib/sljit/sljitNativeARM_T2_32.c
ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c
ext/pcre/pcrelib/sljit/sljitNativePPC_common.c
ext/pcre/pcrelib/sljit/sljitNativeSPARC_common.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pcre/pcrelib/sljit/sljitNativeX86_32.c
ext/pcre/pcrelib/sljit/sljitNativeX86_64.c
ext/pcre/pcrelib/sljit/sljitNativeX86_common.c
ext/pcre/pcrelib/sljit/sljitUtils.c

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Thu, 30 Apr 2015 05:28:04 +0000 (22:28 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Upgrade to PCRE 8.37 due to various bugfixes

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Thu, 30 Apr 2015 05:27:21 +0000 (22:27 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Upgrade to PCRE 8.37 due to various bugfixes

9 years agoUpgrade to PCRE 8.37 due to various bugfixes
Stanislav Malyshev [Thu, 30 Apr 2015 05:25:02 +0000 (22:25 -0700)]
Upgrade to PCRE 8.37 due to various bugfixes

9 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Wed, 29 Apr 2015 22:03:46 +0000 (00:03 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.6.10 will be next

9 years ago5.6.10 will be next
Ferenc Kovacs [Wed, 29 Apr 2015 22:01:55 +0000 (00:01 +0200)]
5.6.10 will be next

9 years agoDisallow self etc outside classes at compile-time
Nikita Popov [Mon, 27 Apr 2015 19:14:58 +0000 (21:14 +0200)]
Disallow self etc outside classes at compile-time

Also fix a bug with return types where "self" was rejected inside
a class, but not on a method.

Fallout: A couple of tests changed to more generic error messages.

9 years agoImprove fast_is_[not_]identical() functions to teturn value instead of takeing additi...
Dmitry Stogov [Wed, 29 Apr 2015 13:43:23 +0000 (16:43 +0300)]
Improve fast_is_[not_]identical() functions to teturn value instead of takeing additional arguments.
Pair INSTANCEOF with the following JMPZ/JMPNZ.

9 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Wed, 29 Apr 2015 11:21:29 +0000 (14:21 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  5.5.26 now

9 years agoFixed repeatable opcodes on CALL VM without global registers
Dmitry Stogov [Wed, 29 Apr 2015 11:20:44 +0000 (14:20 +0300)]
Fixed repeatable opcodes on CALL VM without global registers

9 years agoMerge branch 'PHP-5.6'
Julien Pauli [Wed, 29 Apr 2015 09:22:05 +0000 (11:22 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.5.26 now

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Julien Pauli [Wed, 29 Apr 2015 09:21:18 +0000 (11:21 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.5.26 now

Conflicts:
configure.in
main/php_version.h

9 years ago5.5.26 now
Julien Pauli [Wed, 29 Apr 2015 09:16:06 +0000 (11:16 +0200)]
5.5.26 now