]> granicus.if.org Git - php/log
php
10 years agoCleanup globals initialization
Xinchen Hui [Fri, 13 Feb 2015 02:58:35 +0000 (10:58 +0800)]
Cleanup globals initialization

10 years agoUnused vars
Xinchen Hui [Fri, 13 Feb 2015 02:53:40 +0000 (10:53 +0800)]
Unused vars

10 years agoLimit HashTable size to avoid integer overflow checks
Dmitry Stogov [Thu, 12 Feb 2015 23:12:42 +0000 (02:12 +0300)]
Limit HashTable size to avoid integer overflow checks

10 years agoCleanup checks in zend_builtin_functions.c
Nikita Popov [Thu, 12 Feb 2015 22:31:01 +0000 (23:31 +0100)]
Cleanup checks in zend_builtin_functions.c

The EXPLICIT_ABSTRACT_CLASS comparisons are no longer necessary.

10 years agoAdd test to ensure ReflectionClass works correctly with traits
Nikita Popov [Thu, 12 Feb 2015 22:25:09 +0000 (23:25 +0100)]
Add test to ensure ReflectionClass works correctly with traits

Some of these were not working correctly before Guilherme's patch.
Another was broken by it and is fixed in this commit as well.

10 years agoMade ZEND_ACC_TRAIT a saner value
Guilherme Blanco [Thu, 12 Feb 2015 22:19:14 +0000 (23:19 +0100)]
Made ZEND_ACC_TRAIT a saner value

CC_TRAIT valued as 0x120 is too magical to be comprehensible by others.

10 years agoMerge branch 'master' of git.php.net:php-src
Anatol Belski [Thu, 12 Feb 2015 19:30:48 +0000 (20:30 +0100)]
Merge branch 'master' of git.php.net:php-src

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Thu, 12 Feb 2015 19:29:51 +0000 (20:29 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  backport gd config.w32 to support freetype 2.5

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Thu, 12 Feb 2015 19:29:24 +0000 (20:29 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  backport gd config.w32 to support freetype 2.5

10 years agobackport gd config.w32 to support freetype 2.5
Anatol Belski [Thu, 12 Feb 2015 19:27:48 +0000 (20:27 +0100)]
backport gd config.w32 to support freetype 2.5

10 years agofix data types
Anatol Belski [Thu, 12 Feb 2015 08:27:58 +0000 (09:27 +0100)]
fix data types

10 years agofix int to pointer cast
Anatol Belski [Thu, 12 Feb 2015 08:01:42 +0000 (09:01 +0100)]
fix int to pointer cast

10 years agoFixed initialization of global variables in ZTS (this caused valgrind reports on...
Dmitry Stogov [Thu, 12 Feb 2015 13:51:07 +0000 (16:51 +0300)]
Fixed initialization of global variables in ZTS (this caused valgrind reports on few PHPT tests)

10 years agoStop using internal array/object pointer in foreach by reference according to https...
Dmitry Stogov [Thu, 12 Feb 2015 11:36:04 +0000 (14:36 +0300)]
Stop using internal array/object pointer in foreach by reference according to https://wiki.php.net/rfc/php7_foreach

10 years agoFix "forech" statemt behaviour according to https://wiki.php.net/rfc/php7_foreach
Dmitry Stogov [Thu, 12 Feb 2015 10:57:12 +0000 (13:57 +0300)]
Fix "forech" statemt behaviour according to https://wiki.php.net/rfc/php7_foreach

Squashed commit of the following:

commit 1e41295097576dbce6c197ddb7507c07ccae3cbe
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Sat Jan 31 07:28:58 2015 +0300

    Generalize HashTableIterator API to allows its usage without involvement of HashTable.nInternalPonter

commit 5406f21b11e563069d64045e599693b51c444b63
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 18:08:43 2015 +0300

    Reduced alghorithms complexity

commit b37f1d58d2a141b6e1d980a461ccb588d4317d2e
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 18:08:30 2015 +0300

    Fixed test name

commit fb2d079645829b12ed4e55a461034df6400bc430
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 18:08:05 2015 +0300

    API cleanup

commit 08302c0d6d1cab279b9f2129df03a057baddf2ff
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 14:20:46 2015 +0300

    Make array_splice() to preserve foreach hash position

commit cc4b7be41e2e2b9b0d7a3c8e98466b8886692e6e
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 12:24:31 2015 +0300

    Make internal function, operation on array passed by reference, to preserve foreach hash position

commit 5aa9712b0a30303aadfe3bdd8ae1f072ca3e6ba1
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 09:49:35 2015 +0300

    Implement consistent behavior for foreach by value over plain object

commit 4c5b385ff53ae9f0b52572e98c4db801f56603b0
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 07:56:37 2015 +0300

    More careful iterators update.

commit 721fc9e80d2ee8f2cd79c8c3cdceffae2c72de92
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Jan 29 21:43:28 2015 +0300

    Added new test

commit 15a23b1218b3e38630d677751a975907daa2cd54
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Jan 29 21:05:02 2015 +0300

    Reimplement iteration magic with HashTableIterators (see https://wiki.php.net/rfc/php7_foreach#implementation_details)

commit 10a3260b1f16b6075fd8140f673dfef4d5efea91
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Jan 29 21:04:44 2015 +0300

    New test

commit eef80c583762d1e98d177cdbb27e3a8a6b0c4539
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jan 28 16:52:21 2015 +0300

    Fixed foreach by reference iteration over constant array

commit 61e739187391661e2d541947bec25d7dcc4479f3
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jan 28 14:59:54 2015 +0300

    Fixed temporary variable re-allocation pass

commit 92e90c09f085c22707ff4a59201f016f56e0ef8b
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jan 28 12:44:57 2015 +0300

    Fixed operand destruction in case of exceptions in iterator

commit dd2a36a2074bbb0cb31de00b66dcf2812d6d753f
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jan 28 10:02:34 2015 +0300

    Use GET_OP1_ZVAL_PTR_DEREF() (IS_TMP_VAR and IS_CONST can't be IS_REFERENCE)

commit 4638f7b91407c48710007af82a68da0007c820f2
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jan 28 07:43:28 2015 +0300

    Change "foreach" statement behavior (this is just a PoC yet)

    - "foreach by value" don't relay on internal array/object pointer and doesnt perform array duplication. It just locks it incrementing reference counter. If the original array is modified by some code, the copy on write is performed and "foreach" still work with the old copy.

    - it makes no difference if array given to "foreach by value" is reference itself

    - "foreach by reference" still use internal array/object pointer and should work similar to PHP-5. (This id not completely implemented)

10 years agoPass maxlifetime to save handlers
Yasuo Ohgaki [Thu, 12 Feb 2015 03:32:36 +0000 (12:32 +0900)]
Pass maxlifetime to save handlers

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Thu, 12 Feb 2015 03:28:42 +0000 (11:28 +0800)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Thu, 12 Feb 2015 03:28:30 +0000 (11:28 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoAdded test for #69017
Xinchen Hui [Thu, 12 Feb 2015 03:28:16 +0000 (11:28 +0800)]
Added test for #69017

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Thu, 12 Feb 2015 03:20:35 +0000 (11:20 +0800)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Thu, 12 Feb 2015 02:59:59 +0000 (10:59 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoFixed bug #69017 (Fail to push to the empty array with the constant value defined...
Xinchen Hui [Thu, 12 Feb 2015 02:59:28 +0000 (10:59 +0800)]
Fixed bug #69017 (Fail to push to the empty array with the constant value defined in class scope)

10 years agoMerge branch 'PHP-5.6'
Lior Kaplan [Wed, 11 Feb 2015 20:41:52 +0000 (22:41 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add missing NEWS entry for revert of bug #41631
  Add CVE ID to bug #68676
  Align email format for recent NEWS entries
  Bug #55508 was fixed in 5.5.19 with 15ba757a, not in 5.5.18
  Add missing NEWS entry for revert of bug #41631
  Add missing NEWS entry for bug #68027
  Align format for bug #68799
  Bug #68361 was fixed in 5.5.20 using 327d4f9a, not in 5.5.19
  Bug #55618 was fixed in 5.5.21 using eaf107c0
  Add security bugs fixed in 5.5.18
  Add CVE ID to bug #68676
  Align email format for recent NEWS entries

10 years agoAlign format to Fixed bug #... , later used to create the website changelog
Lior Kaplan [Wed, 11 Feb 2015 20:39:31 +0000 (22:39 +0200)]
Align format to Fixed bug #... , later used to create the website changelog

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Lior Kaplan [Wed, 11 Feb 2015 20:30:48 +0000 (22:30 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #55508 was fixed in 5.5.19 with 15ba757a, not in 5.5.18
  Add missing NEWS entry for revert of bug #41631
  Add missing NEWS entry for bug #68027
  Align format for bug #68799
  Bug #68361 was fixed in 5.5.20 using 327d4f9a, not in 5.5.19
  Bug #55618 was fixed in 5.5.21 using eaf107c0
  Add security bugs fixed in 5.5.18
  Add CVE ID to bug #68676
  Align email format for recent NEWS entries

10 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Wed, 11 Feb 2015 14:41:52 +0000 (17:41 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  add missing test for class member access with deference relates to https://wiki.php.net/rfc/uniform_variable_syntax
  fix dir separator in test

10 years agoFixed bug #69025 (Invalid read of size 4 when calling __callStatic)
Dmitry Stogov [Wed, 11 Feb 2015 14:41:21 +0000 (17:41 +0300)]
Fixed bug #69025 (Invalid read of size 4 when calling __callStatic)

10 years agoadd missing test for class member access with deference
Márcio Almada [Mon, 9 Feb 2015 16:10:33 +0000 (13:10 -0300)]
add missing test for class member access with deference
relates to https://wiki.php.net/rfc/uniform_variable_syntax

10 years agofix dir separator in test
Anatol Belski [Wed, 11 Feb 2015 14:10:48 +0000 (15:10 +0100)]
fix dir separator in test

10 years agoAdd missing NEWS entry for revert of bug #41631
Lior Kaplan [Wed, 11 Feb 2015 12:02:55 +0000 (14:02 +0200)]
Add missing NEWS entry for revert of bug #41631

10 years agoAdd CVE ID to bug #68676
Lior Kaplan [Wed, 11 Feb 2015 12:01:55 +0000 (14:01 +0200)]
Add CVE ID to bug #68676

10 years agoAlign email format for recent NEWS entries
Lior Kaplan [Wed, 11 Feb 2015 12:01:16 +0000 (14:01 +0200)]
Align email format for recent NEWS entries

10 years agoBug #55508 was fixed in 5.5.19 with 15ba757a, not in 5.5.18
Lior Kaplan [Wed, 11 Feb 2015 11:20:44 +0000 (13:20 +0200)]
Bug #55508 was fixed in 5.5.19 with 15ba757a, not in 5.5.18

See https://github.com/php/php-src/pull/631#issuecomment-61969527

10 years agoAdd missing NEWS entry for revert of bug #41631
Lior Kaplan [Wed, 11 Feb 2015 11:15:18 +0000 (13:15 +0200)]
Add missing NEWS entry for revert of bug #41631

10 years agoAdd missing NEWS entry for bug #68027
Lior Kaplan [Wed, 11 Feb 2015 11:13:03 +0000 (13:13 +0200)]
Add missing NEWS entry for bug #68027

10 years agoAlign format for bug #68799
Lior Kaplan [Wed, 11 Feb 2015 11:11:55 +0000 (13:11 +0200)]
Align format for bug #68799

10 years agoBug #68361 was fixed in 5.5.20 using 327d4f9a, not in 5.5.19
Lior Kaplan [Wed, 11 Feb 2015 11:08:19 +0000 (13:08 +0200)]
Bug #68361 was fixed in 5.5.20 using 327d4f9a, not in 5.5.19

10 years agoBug #55618 was fixed in 5.5.21 using eaf107c0
Lior Kaplan [Wed, 11 Feb 2015 11:04:32 +0000 (13:04 +0200)]
Bug #55618 was fixed in 5.5.21 using eaf107c0

10 years agofix incompatible pointer type
Anatol Belski [Wed, 11 Feb 2015 11:03:35 +0000 (12:03 +0100)]
fix incompatible pointer type

10 years agofix values for gid and uid
Anatol Belski [Wed, 11 Feb 2015 10:43:27 +0000 (11:43 +0100)]
fix values for gid and uid

As stated by MSDN, these fields are always set to zero

10 years agosilence unused variable warning
Anatol Belski [Wed, 11 Feb 2015 10:22:49 +0000 (11:22 +0100)]
silence unused variable warning

10 years agoremove useless condition
Anatol Belski [Wed, 11 Feb 2015 10:19:19 +0000 (11:19 +0100)]
remove useless condition

10 years agofix uninitialized value warn
Anatol Belski [Wed, 11 Feb 2015 10:17:34 +0000 (11:17 +0100)]
fix uninitialized value warn

10 years agoAdd security bugs fixed in 5.5.18
Lior Kaplan [Wed, 11 Feb 2015 10:02:39 +0000 (12:02 +0200)]
Add security bugs fixed in 5.5.18

10 years agoAdd CVE ID to bug #68676
Lior Kaplan [Wed, 11 Feb 2015 10:00:19 +0000 (12:00 +0200)]
Add CVE ID to bug #68676

10 years agoAlign email format for recent NEWS entries
Lior Kaplan [Wed, 11 Feb 2015 09:05:02 +0000 (11:05 +0200)]
Align email format for recent NEWS entries

10 years agoForget this change
Xinchen Hui [Wed, 11 Feb 2015 08:06:47 +0000 (16:06 +0800)]
Forget this change

10 years agoExpose zend_string_equals_str_ci
Xinchen Hui [Wed, 11 Feb 2015 08:03:48 +0000 (16:03 +0800)]
Expose zend_string_equals_str_ci

10 years agoFixed possible memory leak
Dmitry Stogov [Wed, 11 Feb 2015 06:39:38 +0000 (09:39 +0300)]
Fixed possible memory leak

10 years agoAdd a constant of type CONST_PERSISTENT to test
Bob Weinand [Tue, 10 Feb 2015 21:53:50 +0000 (22:53 +0100)]
Add a constant of type CONST_PERSISTENT to test

10 years agoRevert removal of two ReflectionParameter functions
Bob Weinand [Tue, 10 Feb 2015 21:17:43 +0000 (22:17 +0100)]
Revert removal of two ReflectionParameter functions
Rather fix them for now by exempting function parameter defaults from *any* (non-ct) constant substitution (also from persistent constant substitution, which was already broken before)

10 years agoDon't convert options in-place. They may be elements of constant array.
Dmitry Stogov [Tue, 10 Feb 2015 21:02:45 +0000 (00:02 +0300)]
Don't convert options in-place. They may be elements of constant array.

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Tue, 10 Feb 2015 15:59:48 +0000 (16:59 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix dir separator in test

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Tue, 10 Feb 2015 15:59:22 +0000 (16:59 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix dir separator in test

10 years agofix dir separator in test
Anatol Belski [Tue, 10 Feb 2015 15:58:59 +0000 (16:58 +0100)]
fix dir separator in test

10 years agobetter alignment + support size_t
Anatol Belski [Tue, 10 Feb 2015 14:59:33 +0000 (15:59 +0100)]
better alignment + support size_t

10 years agoRevert "Revert "Improve and generalize class constant substitution""
Bob Weinand [Tue, 10 Feb 2015 14:43:23 +0000 (15:43 +0100)]
Revert "Revert "Improve and generalize class constant substitution""

This reverts commit 400e65e955f08ad6ae57c1a15be04d5852107252.

Removing ReflectionParameter::getDefaultValueConstantName() and isDefaultValueConstant()
They become useless with such optimizations and already anyway are (e.g. CONSTANT?:CONSTANT ... yields the constant back without telling isDefaultValueConstant() about it etc.)

10 years agoAdd missing header inclusion
Reeze Xia [Tue, 10 Feb 2015 14:30:54 +0000 (22:30 +0800)]
Add missing header inclusion

10 years agoGet rid of old HashTable iteration API
Dmitry Stogov [Tue, 10 Feb 2015 13:59:34 +0000 (16:59 +0300)]
Get rid of old HashTable iteration API

10 years agoUpdate libmagic.patch to reflect changes made
Reeze Xia [Tue, 10 Feb 2015 12:48:58 +0000 (20:48 +0800)]
Update libmagic.patch to reflect changes made

10 years agoUse new ZEND_HASH_FOREACH_... API.
Dmitry Stogov [Tue, 10 Feb 2015 12:43:12 +0000 (15:43 +0300)]
Use new ZEND_HASH_FOREACH_... API.

10 years agouse portable strtol
Anatol Belski [Tue, 10 Feb 2015 12:06:24 +0000 (13:06 +0100)]
use portable strtol

10 years agoAvoid reallocation in preg_replace() if nothing was replaced
Dmitry Stogov [Tue, 10 Feb 2015 10:30:25 +0000 (13:30 +0300)]
Avoid reallocation in preg_replace() if nothing was replaced

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Tue, 10 Feb 2015 10:18:43 +0000 (11:18 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  oops, forgot sudo for make install

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Tue, 10 Feb 2015 10:18:34 +0000 (11:18 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  oops, forgot sudo for make install

10 years agooops, forgot sudo for make install
Ferenc Kovacs [Tue, 10 Feb 2015 10:18:19 +0000 (11:18 +0100)]
oops, forgot sudo for make install

10 years agoadd php7 compatible pear installer built from their stable branch
Ferenc Kovacs [Tue, 10 Feb 2015 09:37:44 +0000 (10:37 +0100)]
add php7 compatible pear installer built from their stable branch

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Tue, 10 Feb 2015 09:36:45 +0000 (10:36 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add make install

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Tue, 10 Feb 2015 09:36:25 +0000 (10:36 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add make install

Conflicts:
travis/compile.sh

10 years agoadd make install
Ferenc Kovacs [Tue, 10 Feb 2015 09:34:52 +0000 (10:34 +0100)]
add make install

10 years agoMerge branch 'php7_removals' POST_PHP7_REMOVALS
Anatol Belski [Tue, 10 Feb 2015 09:09:53 +0000 (10:09 +0100)]
Merge branch 'php7_removals'

10 years agoupdated NEWS
Anatol Belski [Tue, 10 Feb 2015 07:59:10 +0000 (08:59 +0100)]
updated NEWS

10 years agoupdated UPGRADING
Anatol Belski [Tue, 10 Feb 2015 07:56:18 +0000 (08:56 +0100)]
updated UPGRADING

10 years agoremoved obsolete php.ini options
Anatol Belski [Tue, 10 Feb 2015 07:48:19 +0000 (08:48 +0100)]
removed obsolete php.ini options

10 years agoremoved ext/sybase_ct
Anatol Belski [Tue, 10 Feb 2015 07:42:37 +0000 (08:42 +0100)]
removed ext/sybase_ct

10 years agoremoved ext/mssql
Anatol Belski [Tue, 10 Feb 2015 07:41:57 +0000 (08:41 +0100)]
removed ext/mssql

10 years agoremoved sapi/webjames
Anatol Belski [Tue, 10 Feb 2015 07:41:22 +0000 (08:41 +0100)]
removed sapi/webjames

10 years agoremoved sapi/tux
Anatol Belski [Tue, 10 Feb 2015 07:40:59 +0000 (08:40 +0100)]
removed sapi/tux

10 years agoremoved sapi/thttpd
Anatol Belski [Tue, 10 Feb 2015 07:40:34 +0000 (08:40 +0100)]
removed sapi/thttpd

10 years agoremoved sapi/roxed
Anatol Belski [Tue, 10 Feb 2015 07:40:13 +0000 (08:40 +0100)]
removed sapi/roxed

10 years agoremoved sapi/pi3web
Anatol Belski [Tue, 10 Feb 2015 07:39:31 +0000 (08:39 +0100)]
removed sapi/pi3web

10 years agoremoved sapi/phttpd
Anatol Belski [Tue, 10 Feb 2015 07:38:47 +0000 (08:38 +0100)]
removed sapi/phttpd

10 years agoremoved sapi/milter
Anatol Belski [Tue, 10 Feb 2015 07:38:21 +0000 (08:38 +0100)]
removed sapi/milter

10 years agoremoved sapi/isapi
Anatol Belski [Tue, 10 Feb 2015 07:37:44 +0000 (08:37 +0100)]
removed sapi/isapi

10 years agoremoved sapi/continuity
Anatol Belski [Tue, 10 Feb 2015 07:37:14 +0000 (08:37 +0100)]
removed sapi/continuity

10 years agoremoved sapi/caudium
Anatol Belski [Tue, 10 Feb 2015 07:36:43 +0000 (08:36 +0100)]
removed sapi/caudium

10 years agoremoved sapi/apache2filter
Anatol Belski [Tue, 10 Feb 2015 07:36:12 +0000 (08:36 +0100)]
removed sapi/apache2filter

10 years agoremoved sapi/apache_hooks
Anatol Belski [Tue, 10 Feb 2015 07:35:36 +0000 (08:35 +0100)]
removed sapi/apache_hooks

10 years agoremoved sapi/apache
Anatol Belski [Tue, 10 Feb 2015 07:34:56 +0000 (08:34 +0100)]
removed sapi/apache

10 years agoremoved sapi/aolserver
Anatol Belski [Tue, 10 Feb 2015 07:33:34 +0000 (08:33 +0100)]
removed sapi/aolserver

10 years agoRevert "Improve and generalize class constant substitution" PRE_PHP7_REMOVALS
Bob Weinand [Mon, 9 Feb 2015 21:44:25 +0000 (22:44 +0100)]
Revert "Improve and generalize class constant substitution"

This reverts commit 9ff3800b79e9fe69ae821d18e23b2f0a156a100c.

10 years agoMerge branch 'PHP-5.6'
Daniel Lowrey [Mon, 9 Feb 2015 20:14:47 +0000 (15:14 -0500)]
Merge branch 'PHP-5.6'

Conflicts:
ext/openssl/xp_ssl.c

10 years agoFixed dump_bt and printzv
Dmitry Stogov [Mon, 9 Feb 2015 19:43:22 +0000 (22:43 +0300)]
Fixed dump_bt and printzv

10 years agoAvoid repeatable calls to strstr()
Dmitry Stogov [Mon, 9 Feb 2015 19:42:37 +0000 (22:42 +0300)]
Avoid repeatable calls to strstr()

10 years agofix json globals
Michael Wallner [Mon, 9 Feb 2015 16:57:05 +0000 (17:57 +0100)]
fix json globals

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Daniel Lowrey [Mon, 9 Feb 2015 16:44:09 +0000 (11:44 -0500)]
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
ext/openssl/xp_ssl.c

10 years agoNEWS
Daniel Lowrey [Mon, 9 Feb 2015 16:42:40 +0000 (11:42 -0500)]
NEWS

10 years agoMiscellaneous cleanup
Daniel Lowrey [Mon, 9 Feb 2015 16:42:17 +0000 (11:42 -0500)]
Miscellaneous cleanup

10 years agoMerge branch 'PHP-5.5' of github.com:bbroerman30/php-src into PHP-5.5
Daniel Lowrey [Mon, 9 Feb 2015 16:40:04 +0000 (11:40 -0500)]
Merge branch 'PHP-5.5' of github.com:bbroerman30/php-src into PHP-5.5

10 years agoImprove and generalize class constant substitution
Bob Weinand [Sat, 7 Feb 2015 00:44:31 +0000 (01:44 +0100)]
Improve and generalize class constant substitution