granicus.if.org Git

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

projects / php / log

commit | commitdiff | tree

Dmitry Stogov [Tue, 5 May 2015 09:57:30 +0000 (12:57 +0300)]

Removed check for count() in SXE class

commit | commitdiff | tree

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

commit | commitdiff | tree

Xinchen Hui [Tue, 5 May 2015 09:25:25 +0000 (17:25 +0800)]

Unused macros

commit | commitdiff | tree

Xinchen Hui [Tue, 5 May 2015 09:24:17 +0000 (17:24 +0800)]

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

commit | commitdiff | tree

Xinchen Hui [Tue, 5 May 2015 09:23:54 +0000 (17:23 +0800)]

Optimize cast simplexml to IS_BOOL

commit | commitdiff | tree

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

commit | commitdiff | tree

Remi Collet [Tue, 5 May 2015 09:22:29 +0000 (11:22 +0200)]

Relax tests failing on i386 with new zic

commit | commitdiff | tree

Xinchen Hui [Tue, 5 May 2015 09:02:54 +0000 (17:02 +0800)]

Unused var

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Dmitry Stogov [Tue, 5 May 2015 08:10:21 +0000 (11:10 +0300)]

Avoid repeatable lookups for count() method in the same class entry.

commit | commitdiff | tree

Dmitry Stogov [Tue, 5 May 2015 08:09:18 +0000 (11:09 +0300)]

Inline IS_LONG value calculation and avoid strtol() call.

commit | commitdiff | tree

Xinchen Hui [Tue, 5 May 2015 03:07:02 +0000 (11:07 +0800)]

Merge branch 'PHP-5.6'

Conflicts:
ext/opcache/ZendAccelerator.h

commit | commitdiff | tree

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

commit | commitdiff | tree

Xinchen Hui [Tue, 5 May 2015 03:06:14 +0000 (11:06 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Tue, 5 May 2015 03:06:04 +0000 (11:06 +0800)]

Update version

commit | commitdiff | tree

Anatol Belski [Mon, 4 May 2015 14:07:27 +0000 (16:07 +0200)]

add config vars for phpize where conf opts aren't enabled

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 4 May 2015 13:59:14 +0000 (15:59 +0200)]

add config vars for phpize

commit | commitdiff | tree

Anatol Belski [Mon, 4 May 2015 13:13:27 +0000 (15:13 +0200)]

fix compiler check for phpize

commit | commitdiff | tree

Xinchen Hui [Mon, 4 May 2015 11:23:21 +0000 (19:23 +0800)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Xinchen Hui [Mon, 4 May 2015 11:22:22 +0000 (19:22 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Mon, 4 May 2015 11:21:54 +0000 (19:21 +0800)]

Saving the latter checking in most cases

commit | commitdiff | tree

Xinchen Hui [Mon, 4 May 2015 02:35:55 +0000 (10:35 +0800)]

Fixed #69566 in master

commit | commitdiff | tree

Xinchen Hui [Mon, 4 May 2015 02:34:57 +0000 (10:34 +0800)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Xinchen Hui [Mon, 4 May 2015 02:34:48 +0000 (10:34 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Mon, 4 May 2015 02:34:39 +0000 (10:34 +0800)]

Update NEWS

commit | commitdiff | tree

John Boehr [Sun, 3 May 2015 21:29:19 +0000 (14:29 -0700)]

Fix uninitialized value with extension traits

commit | commitdiff | tree

John Boehr [Sun, 3 May 2015 21:29:19 +0000 (14:29 -0700)]

Fix uninitialized value with extension traits

commit | commitdiff | tree

Christopher Jones [Sat, 2 May 2015 17:03:30 +0000 (10:03 -0700)]

Add unique prefix to exported function

commit | commitdiff | tree

Christopher Jones [Sat, 2 May 2015 01:22:41 +0000 (18:22 -0700)]

First pass migrating PDO_OCI to PHP 7

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Stanislav Malyshev [Thu, 30 Apr 2015 05:25:02 +0000 (22:25 -0700)]

Upgrade to PCRE 8.37 due to various bugfixes

commit | commitdiff | tree

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

commit | commitdiff | tree

Ferenc Kovacs [Wed, 29 Apr 2015 22:01:55 +0000 (00:01 +0200)]

5.6.10 will be next

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Dmitry Stogov [Wed, 29 Apr 2015 11:20:44 +0000 (14:20 +0300)]

Fixed repeatable opcodes on CALL VM without global registers

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Julien Pauli [Wed, 29 Apr 2015 09:16:06 +0000 (11:16 +0200)]

5.5.26 now

commit | commitdiff | tree

Dmitry Stogov [Wed, 29 Apr 2015 01:17:59 +0000 (04:17 +0300)]

Paired instuctions frequientiy used together (e.g. comparisons + conditional jumps)

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:29:04 +0000 (00:29 +0100)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:28:56 +0000 (00:28 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:28:50 +0000 (00:28 +0100)]

Use new structures for tzdb header here as well

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:28:20 +0000 (00:28 +0100)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:28:04 +0000 (00:28 +0100)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:27:55 +0000 (00:27 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:25:29 +0000 (00:25 +0100)]

This doesn't work in PHP 5.5 - sigh, I wish the libs were kept in sync

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:10:40 +0000 (00:10 +0100)]

Merge branch 'PHP-5.6'

Conflicts:
ext/date/lib/parse_tz.c

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:09:00 +0000 (00:09 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:08:28 +0000 (00:08 +0100)]

Split header reading in 32bit and 64bit variants.

We need to use the 64bit header for the second set of transitions, as there
could be a different amount of transitions. This also opens up the way towards
real 64bit support.

commit | commitdiff | tree

Dmitry Stogov [Tue, 28 Apr 2015 21:40:43 +0000 (00:40 +0300)]

Make ZEND_RECV_INIT and ZEND_BIND_GLOBALS opcodes to be "repeatabe" with inner-loop instead of main interpreter loop.

commit | commitdiff | tree

Dmitry Stogov [Tue, 28 Apr 2015 20:57:21 +0000 (23:57 +0300)]

Optimize opcodes for fast path

commit | commitdiff | tree

Dmitry Stogov [Tue, 28 Apr 2015 16:11:45 +0000 (19:11 +0300)]

Micro optimizations

commit | commitdiff | tree

Dmitry Stogov [Tue, 28 Apr 2015 16:11:23 +0000 (19:11 +0300)]

Simplified code

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 15:08:03 +0000 (17:08 +0200)]

updated NEWS and fixed a typo

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 14:58:30 +0000 (15:58 +0100)]

Merge branch 'PHP-5.6'

Conflicts:
ext/date/lib/parse_iso_intervals.re
ext/date/lib/timelib.h

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 14:57:35 +0000 (15:57 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 14:57:26 +0000 (15:57 +0100)]

Merge whitespace changes that have been made to timelib and PHP-5.6 and master

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 13:35:01 +0000 (15:35 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
updated NEWS
backported patch for bug #69472

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 13:34:11 +0000 (15:34 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 13:32:22 +0000 (15:32 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
backported patch for bug #69472

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 13:31:47 +0000 (15:31 +0200)]

backported patch for bug #69472

commit | commitdiff | tree

Jan Starke [Thu, 16 Apr 2015 19:10:51 +0000 (21:10 +0200)]

Fixed bug #69472 php_sys_readlink ignores misc errors from GetFinalPathNameByHandleA

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 13:15:30 +0000 (15:15 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #69381 out of memory with sage odbc driver

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 13:14:45 +0000 (15:14 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 13:13:46 +0000 (15:13 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated NEWS
Fixed bug #69381 out of memory with sage odbc driver

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 13:13:19 +0000 (15:13 +0200)]

updated NEWS

commit | commitdiff | tree

Frederic Marchal [Tue, 28 Apr 2015 13:08:53 +0000 (15:08 +0200)]

Fixed bug #69381 out of memory with sage odbc driver

This is just a hotfix as there are still drivers with no full
ODBC 3.x support. This patch origins from bug #68350 which was
solved by the proper 3.0 migration, another driver (Sage)
turned out to have the real issue.

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 13:02:48 +0000 (15:02 +0200)]

fix bug #69381

a simpler version is to be backported

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 12:39:30 +0000 (14:39 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  fix VC9 build with PCRE
  Revert "Fix segfault in ext/date since 957aa2"
  Revert "Fix segfault in ext/date since 957aa2"

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 12:38:45 +0000 (14:38 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix VC9 build with PCRE
Revert "Fix segfault in ext/date since 957aa2"

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 12:38:21 +0000 (14:38 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix VC9 build with PCRE

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 11:15:39 +0000 (13:15 +0200)]

fix VC9 build with PCRE

commit | commitdiff | tree

Matteo Beccati [Tue, 28 Apr 2015 10:48:00 +0000 (12:48 +0200)]

Revert "Fix segfault in ext/date since 957aa2"

This reverts commit b5e5098c50397ed910a79ac1d64b7d0fff2c02e1.

A proper fix from Derick is underway. I apologise for stepping on his toes ;)

commit | commitdiff | tree

Matteo Beccati [Tue, 28 Apr 2015 10:48:00 +0000 (12:48 +0200)]

Revert "Fix segfault in ext/date since 957aa2"

This reverts commit b5e5098c50397ed910a79ac1d64b7d0fff2c02e1.

A proper fix from Derick is underway. I apologise for stepping on his toes ;)

commit | commitdiff | tree

Matteo Beccati [Tue, 28 Apr 2015 10:48:00 +0000 (12:48 +0200)]

Revert "Fix segfault in ext/date since 957aa2"

This reverts commit b5e5098c50397ed910a79ac1d64b7d0fff2c02e1.

A proper fix from Derick is underway. I apologise for stepping on his toes ;)

commit | commitdiff | tree

Remi Collet [Tue, 28 Apr 2015 10:50:30 +0000 (12:50 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  relax tests with huge year (new zic)
  ignore second value for huge timestamp test (new zic)
  relax test for date < INT32_MIN (new zic)
  relax bigbang content (new zic)
  Make date transitions tests more flexible

commit | commitdiff | tree

Remi Collet [Tue, 28 Apr 2015 10:50:09 +0000 (12:50 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  relax tests with huge year (new zic)
  ignore second value for huge timestamp test (new zic)
  relax test for date < INT32_MIN (new zic)
  relax bigbang content (new zic)
  Make date transitions tests more flexible

commit | commitdiff | tree

Remi Collet [Sat, 18 Apr 2015 08:00:15 +0000 (10:00 +0200)]

relax tests with huge year (new zic)

commit | commitdiff | tree

Remi Collet [Sat, 18 Apr 2015 07:37:06 +0000 (09:37 +0200)]

ignore second value for huge timestamp test (new zic)

commit | commitdiff | tree

Remi Collet [Sat, 18 Apr 2015 07:28:29 +0000 (09:28 +0200)]

relax test for date < INT32_MIN (new zic)

commit | commitdiff | tree

Remi Collet [Sat, 18 Apr 2015 07:11:39 +0000 (09:11 +0200)]

relax bigbang content (new zic)

commit | commitdiff | tree

Remi Collet [Sat, 18 Apr 2015 05:47:47 +0000 (07:47 +0200)]

Make date transitions tests more flexible

zic in recent glibc (2.20) introduce a new transitionn
so use a range to avoid failure when total number
of transitions is different (243/244)

commit | commitdiff | tree

Dmitry Stogov [Tue, 28 Apr 2015 09:41:39 +0000 (12:41 +0300)]

Micro optimizations

commit | commitdiff | tree

Matteo Beccati [Tue, 28 Apr 2015 09:08:46 +0000 (11:08 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix segfault in ext/date since 957aa2

commit | commitdiff | tree

Matteo Beccati [Tue, 28 Apr 2015 08:57:52 +0000 (10:57 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix segfault in ext/date since 957aa2

commit | commitdiff | tree

Matteo Beccati [Tue, 28 Apr 2015 08:57:18 +0000 (10:57 +0200)]

Fix segfault in ext/date since 957aa2