]> granicus.if.org Git - php/log
php
10 years agoUpdate credits
Kalle Sommer Nielsen [Sun, 29 Mar 2015 08:15:43 +0000 (10:15 +0200)]
Update credits

10 years agoWe can re-use the already existing EG(windows_version_info) here and save a little...
Kalle Sommer Nielsen [Sun, 29 Mar 2015 07:47:14 +0000 (09:47 +0200)]
We can re-use the already existing EG(windows_version_info) here and save a little bit of memory too!

10 years agoRemove the special disabled functions on Windows, since we don't even support those...
Kalle Sommer Nielsen [Sun, 29 Mar 2015 07:41:47 +0000 (09:41 +0200)]
Remove the special disabled functions on Windows, since we don't even support those versions of Windows anymore hence it makes no sense to even check for it

10 years agoAnother minor cleanup, drop ENFORCE_SAFE_MODE (all except pdo_pgsql have #if's for...
Kalle Sommer Nielsen [Sun, 29 Mar 2015 07:34:05 +0000 (09:34 +0200)]
Another minor cleanup, drop ENFORCE_SAFE_MODE (all except pdo_pgsql have #if's for checking already)

10 years agoShameless self credit for the Windows support for contributions in the almost past...
Kalle Sommer Nielsen [Sun, 29 Mar 2015 06:11:08 +0000 (08:11 +0200)]
Shameless self credit for the Windows support for contributions in the almost past decade (How time flies when you are having fun)

10 years agoThis should be the last of the old VC stuff in the Windows build system, also up...
Kalle Sommer Nielsen [Sun, 29 Mar 2015 06:05:42 +0000 (08:05 +0200)]
This should be the last of the old VC stuff in the Windows build system, also up the check to require VC11 now

10 years agoForgot this one in the last commit, removes old VC support from ext/fileinfo
Kalle Sommer Nielsen [Sun, 29 Mar 2015 05:54:18 +0000 (07:54 +0200)]
Forgot this one in the last commit, removes old VC support from ext/fileinfo

10 years agoDrop the VC6 portable version of strtoi64, as it is no longer needed
Kalle Sommer Nielsen [Sun, 29 Mar 2015 05:49:35 +0000 (07:49 +0200)]
Drop the VC6 portable version of strtoi64, as it is no longer needed

10 years agoDrop old VC support for ext/fileinfo.
Kalle Sommer Nielsen [Sun, 29 Mar 2015 05:48:48 +0000 (07:48 +0200)]
Drop old VC support for ext/fileinfo.

@Anatol, I generated the updated patch file against file 5.22, since you are the one that usually updates it, can you please confirm it works?

10 years agoDrop this redundant check, since the minimum version of VC we support is VC11 (_MSC_V...
Kalle Sommer Nielsen [Sun, 29 Mar 2015 05:14:54 +0000 (07:14 +0200)]
Drop this redundant check, since the minimum version of VC we support is VC11 (_MSC_VER == 1700) in ext/date

10 years agoDrop old VC support in Zend Engine, this also kills the remaining MessageBox fix...
Kalle Sommer Nielsen [Sun, 29 Mar 2015 05:10:39 +0000 (07:10 +0200)]
Drop old VC support in Zend Engine, this also kills the remaining MessageBox fix for Windows 9x that Anatol changed a while back

10 years agoDrop old VC support (VC <= 9), for dns.c, this means that DNS_TYPE_NAPTR always is...
Kalle Sommer Nielsen [Sun, 29 Mar 2015 04:57:11 +0000 (06:57 +0200)]
Drop old VC support (VC <= 9), for dns.c, this means that DNS_TYPE_NAPTR always is available

10 years agoRemove this VC8 check as our minimum target version of VC is higher
Kalle Sommer Nielsen [Sun, 29 Mar 2015 04:50:09 +0000 (06:50 +0200)]
Remove this VC8 check as our minimum target version of VC is higher

10 years agoDrop this VC8+ check, since our bare minimum of required VC version is higher anyway...
Kalle Sommer Nielsen [Sun, 29 Mar 2015 04:45:40 +0000 (06:45 +0200)]
Drop this VC8+ check, since our bare minimum of required VC version is higher anyway, meaning that CRT warnings are always supported.

10 years agoDrop VC6 support in sapi/apache2handler
Kalle Sommer Nielsen [Sun, 29 Mar 2015 04:37:07 +0000 (06:37 +0200)]
Drop VC6 support in sapi/apache2handler

10 years agoDrop VC6 support in ext/calendar
Kalle Sommer Nielsen [Sun, 29 Mar 2015 04:35:23 +0000 (06:35 +0200)]
Drop VC6 support in ext/calendar

10 years agoDrop this struct (it was only used for VC6 which we don't support anyway)
Kalle Sommer Nielsen [Sun, 29 Mar 2015 04:20:30 +0000 (06:20 +0200)]
Drop this struct (it was only used for VC6 which we don't support anyway)

10 years agoMerge branch 'master' of https://git.php.net/push/php-src
Kalle Sommer Nielsen [Sun, 29 Mar 2015 04:09:02 +0000 (06:09 +0200)]
Merge branch 'master' of https://git.php.net/push/php-src

10 years agoEnable all compiler warnings and linker warnings for debug builds on Windows. This...
Kalle Sommer Nielsen [Sun, 29 Mar 2015 04:06:24 +0000 (06:06 +0200)]
Enable all compiler warnings and linker warnings for debug builds on Windows. This is a slightly modified version of the patch in #55709

10 years agoFixed typo
Xinchen Hui [Sat, 28 Mar 2015 10:51:57 +0000 (18:51 +0800)]
Fixed typo

10 years agoFixed is_callable/function_exists with disable_functions
Xinchen Hui [Sat, 28 Mar 2015 09:07:11 +0000 (17:07 +0800)]
Fixed is_callable/function_exists with disable_functions

10 years agoFixed memleak
Xinchen Hui [Sat, 28 Mar 2015 06:35:14 +0000 (14:35 +0800)]
Fixed memleak

ext/standard/tests/serialize/bug69210.phpt

10 years agoMerge branch 'bug69315' of https://github.com/laruence/php-src
Xinchen Hui [Sat, 28 Mar 2015 06:09:54 +0000 (14:09 +0800)]
Merge branch 'bug69315' of https://github.com/laruence/php-src

10 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Sat, 28 Mar 2015 03:02:23 +0000 (11:02 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src

10 years agoDrop zend_indent() as it was never used, complete or working
Kalle Sommer Nielsen [Fri, 27 Mar 2015 19:04:46 +0000 (20:04 +0100)]
Drop zend_indent() as it was never used, complete or working

10 years agoDisallow direct incdec of function return value
Nikita Popov [Fri, 27 Mar 2015 15:40:04 +0000 (16:40 +0100)]
Disallow direct incdec of function return value

Matching PHP 5 behavior.

We may want to support this for by-reference returns, but that
requires implementing further checks.

10 years agoMerge branch 'master' of https://git.php.net/push/php-src
Kalle Sommer Nielsen [Fri, 27 Mar 2015 14:21:52 +0000 (15:21 +0100)]
Merge branch 'master' of https://git.php.net/push/php-src

10 years agoRemove these CFLAGS for ereg in opcache, we don't use them anymore (as opcache uses...
Kalle Sommer Nielsen [Fri, 27 Mar 2015 14:01:31 +0000 (15:01 +0100)]
Remove these CFLAGS for ereg in opcache, we don't use them anymore (as opcache uses PCRE) together with ereg being gone

10 years agoAdd RAND_egd check for compiling against LibreSSL
Leigh [Fri, 27 Mar 2015 12:24:36 +0000 (13:24 +0100)]
Add RAND_egd check for compiling against LibreSSL

10 years agoFixed bug #69315
Xinchen Hui [Fri, 27 Mar 2015 09:50:36 +0000 (17:50 +0800)]
Fixed bug #69315

10 years agoUseless comment
Xinchen Hui [Thu, 26 Mar 2015 05:50:43 +0000 (13:50 +0800)]
Useless comment

10 years agoFix test on Windows
Kalle Sommer Nielsen [Thu, 26 Mar 2015 02:29:18 +0000 (03:29 +0100)]
Fix test on Windows

10 years agoFix test on Windows
Kalle Sommer Nielsen [Thu, 26 Mar 2015 02:22:57 +0000 (03:22 +0100)]
Fix test on Windows

10 years agoAnother CRLF test fix
Kalle Sommer Nielsen [Thu, 26 Mar 2015 02:18:42 +0000 (03:18 +0100)]
Another CRLF test fix

10 years agoFix tests on Windows
Kalle Sommer Nielsen [Thu, 26 Mar 2015 02:13:50 +0000 (03:13 +0100)]
Fix tests on Windows

CRLF takes +2 bytes when running the tests, making it yield 13 instead of 11

10 years agoMinor cosmetics for our test functions in the debug build
Kalle Sommer Nielsen [Thu, 26 Mar 2015 01:03:55 +0000 (02:03 +0100)]
Minor cosmetics for our test functions in the debug build

10 years agoAdded tests for the naming collision error message to handle all possible conditions
Kalle Sommer Nielsen [Thu, 26 Mar 2015 00:59:23 +0000 (01:59 +0100)]
Added tests for the naming collision error message to handle all possible conditions

10 years agoChange the error message for colliding class/interface/trait names to be a little...
Kalle Sommer Nielsen [Thu, 26 Mar 2015 00:44:23 +0000 (01:44 +0100)]
Change the error message for colliding class/interface/trait names to be a little more clearer.

  C:\> php -r "interface stdClass { }"
  Error: Cannot declare interface stdClass, because the name is already in use in Command Line Code on line 1

10 years agoremove recognition for no more supported OSes
Anatol Belski [Wed, 25 Mar 2015 18:30:38 +0000 (19:30 +0100)]
remove recognition for no more supported OSes

10 years agoFixed bug #69299 (Regression in array_filter's $flag argument in PHP 7)
Xinchen Hui [Wed, 25 Mar 2015 15:42:58 +0000 (23:42 +0800)]
Fixed bug #69299 (Regression in array_filter's $flag argument in PHP 7)

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Wed, 25 Mar 2015 15:35:56 +0000 (23:35 +0800)]
Merge branch 'PHP-5.6'

Conflicts:
ext/opcache/Optimizer/pass1_5.c

10 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Wed, 25 Mar 2015 15:29:31 +0000 (23:29 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src

10 years agoFixed Bug #69297 (function_exists strange behavior with OPCache on disabled function)
Xinchen Hui [Wed, 25 Mar 2015 15:27:50 +0000 (23:27 +0800)]
Fixed Bug #69297 (function_exists strange behavior with OPCache on disabled function)

is_callable returns true for disable_functions, but function_exists
return false for it.

10 years agointegrate static tsrm_ls cache for ext/odbc
Anatol Belski [Wed, 25 Mar 2015 14:11:21 +0000 (15:11 +0100)]
integrate static tsrm_ls cache for ext/odbc

10 years agofix datatype mismatches
Anatol Belski [Wed, 25 Mar 2015 10:15:59 +0000 (11:15 +0100)]
fix datatype mismatches

10 years agofix datatype mismatches
Anatol Belski [Wed, 25 Mar 2015 09:59:05 +0000 (10:59 +0100)]
fix datatype mismatches

10 years agoRFC:continue_ob accepted
Michael Wallner [Wed, 25 Mar 2015 14:22:37 +0000 (15:22 +0100)]
RFC:continue_ob accepted

10 years agoexpose destroy_uploaded_files_hash in the API (used by apfd extension)
Remi Collet [Wed, 25 Mar 2015 13:31:56 +0000 (14:31 +0100)]
expose destroy_uploaded_files_hash in the API (used by apfd extension)

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Wed, 25 Mar 2015 12:17:19 +0000 (13:17 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3
  fix dir separator in test

10 years agoupdated bundled libsqlite to 3.8.8.3
Anatol Belski [Wed, 25 Mar 2015 12:16:56 +0000 (13:16 +0100)]
updated bundled libsqlite to 3.8.8.3

10 years agoupdated NEWS
Anatol Belski [Wed, 25 Mar 2015 12:14:42 +0000 (13:14 +0100)]
updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Wed, 25 Mar 2015 12:13:42 +0000 (13:13 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3
  fix dir separator in test

10 years agoFixed bug #69287 upgrade bundled sqlite to 3.8.8.3
Anatol Belski [Wed, 25 Mar 2015 12:13:03 +0000 (13:13 +0100)]
Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3

10 years agofix dir separator in test
Anatol Belski [Wed, 25 Mar 2015 12:11:27 +0000 (13:11 +0100)]
fix dir separator in test

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Wed, 25 Mar 2015 09:33:39 +0000 (10:33 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared
  Fixed typo
  Fixed typo

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Wed, 25 Mar 2015 09:33:31 +0000 (10:33 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared

10 years agorevert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared
Remi Collet [Wed, 25 Mar 2015 09:33:08 +0000 (10:33 +0100)]
revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared

10 years agoConstness to zend_get_object_type(), thanks Michael!
Kalle Sommer Nielsen [Wed, 25 Mar 2015 06:01:04 +0000 (07:01 +0100)]
Constness to zend_get_object_type(), thanks Michael!

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Wed, 25 Mar 2015 05:54:49 +0000 (13:54 +0800)]
Merge branch 'PHP-5.6'

10 years agoFixed typo
Xinchen Hui [Wed, 25 Mar 2015 05:54:42 +0000 (13:54 +0800)]
Fixed typo

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Wed, 25 Mar 2015 05:54:30 +0000 (13:54 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoFixed typo
Xinchen Hui [Wed, 25 Mar 2015 05:54:12 +0000 (13:54 +0800)]
Fixed typo

10 years agoMerge branch 'master' of https://git.php.net/push/php-src
Kalle Sommer Nielsen [Wed, 25 Mar 2015 05:32:29 +0000 (06:32 +0100)]
Merge branch 'master' of https://git.php.net/push/php-src

10 years agoChange "Cannot redeclare class X" into "Cannot redeclare class/interface/trait X...
Kalle Sommer Nielsen [Wed, 25 Mar 2015 05:31:11 +0000 (06:31 +0100)]
Change "Cannot redeclare class X" into "Cannot redeclare class/interface/trait X", meaning that the following:

 C:\> php -r "trait A { } trait A { }"

Will now properly print "Cannot redeclare trait A" instead of "Cannot redeclare class A" to make error messages a tiny bit clearer. Admittedly, a better solution can most likely be made by actually telling what the colliding object is a type of.

Internally this adds a new function:
 zend_get_object_type()

10 years agoThe error message is actually "Cannot", not "Can't"
Kalle Sommer Nielsen [Wed, 25 Mar 2015 04:20:58 +0000 (05:20 +0100)]
The error message is actually "Cannot", not "Can't"

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Wed, 25 Mar 2015 04:10:54 +0000 (12:10 +0800)]
Merge branch 'PHP-5.6'

Conflicts:
ext/soap/php_encoding.c

10 years agoUpdate NEWS
Xinchen Hui [Wed, 25 Mar 2015 04:10:08 +0000 (12:10 +0800)]
Update NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Wed, 25 Mar 2015 04:09:35 +0000 (12:09 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoUPdate NEWS
Xinchen Hui [Wed, 25 Mar 2015 04:09:21 +0000 (12:09 +0800)]
UPdate NEWS

10 years agoBug #69293 NEW segfault when using SoapClient::__setSoapHeader (bisected, regression)
Xinchen Hui [Wed, 25 Mar 2015 04:07:25 +0000 (12:07 +0800)]
Bug #69293 NEW segfault when using SoapClient::__setSoapHeader (bisected, regression)

This was a typo introduced in c8eaca013a3922e8383def6158ece2b63f6ec483

10 years agocleanup
Dmitry Stogov [Tue, 24 Mar 2015 22:57:05 +0000 (01:57 +0300)]
cleanup

10 years agorobuster read/write for mod ps_files
Anatol Belski [Tue, 24 Mar 2015 21:01:40 +0000 (22:01 +0100)]
robuster read/write for mod ps_files

10 years agofix datatype mismatches
Anatol Belski [Tue, 24 Mar 2015 20:24:49 +0000 (21:24 +0100)]
fix datatype mismatches

10 years agofix datatype mismatches
Anatol Belski [Tue, 24 Mar 2015 20:15:15 +0000 (21:15 +0100)]
fix datatype mismatches

10 years agofix datatype mismatches
Anatol Belski [Tue, 24 Mar 2015 17:49:54 +0000 (18:49 +0100)]
fix datatype mismatches

10 years agoensure the test uses correct SAPI
Anatol Belski [Tue, 24 Mar 2015 15:25:56 +0000 (16:25 +0100)]
ensure the test uses correct SAPI

10 years agofix typo
Anatol Belski [Tue, 24 Mar 2015 13:52:00 +0000 (14:52 +0100)]
fix typo

10 years agoreplace this version as it's unchanged since 5.4 at least
Anatol Belski [Tue, 24 Mar 2015 06:43:53 +0000 (07:43 +0100)]
replace this version as it's unchanged since 5.4 at least

10 years agoRemoved unused functions
Dmitry Stogov [Tue, 24 Mar 2015 20:40:20 +0000 (23:40 +0300)]
Removed unused functions

10 years agoReverted part committed by mistake
Dmitry Stogov [Tue, 24 Mar 2015 19:56:07 +0000 (22:56 +0300)]
Reverted part committed by mistake

10 years agoOptimized strings concatenation.
Dmitry Stogov [Tue, 24 Mar 2015 19:47:21 +0000 (22:47 +0300)]
Optimized strings concatenation.
ZEND_ADD_STRING/VAR/CHAR are replaced with ZEND_ROPE_INTI, ZEND_ROPE_ADD, ZEND_ROPE_END.
Instead of reallocation and copying string on each ZEND_ADD_STRING/VAR/CAHR, collect all the strings and then allocate and construct the resulting string once.

10 years agoWe can't stay zend_string->h to be zero, because it may lead to hash value recalculat...
Dmitry Stogov [Tue, 24 Mar 2015 13:28:26 +0000 (16:28 +0300)]
We can't stay zend_string->h to be zero, because it may lead to hash value recalculation and update.
But in general zend_string may be put and read-only memory, that would lead to crash.
Always set the high bit of hash_value to prevent recaclulation.

10 years agoFix VERIFY_RETURN separation
Nikita Popov [Tue, 24 Mar 2015 09:48:16 +0000 (10:48 +0100)]
Fix VERIFY_RETURN separation

a) The SAME_FAKE_TYPE check should always occur on the dereferenced
value, otherwise we'll end up separating large referenced arrays.
b) For by-val return with an rc=1 reference, the SEPARATE_ZVAL
wouldn't do anything. Add a ZVAL_UNREF for this case.

I don't like this fix - there must be some better way to express
this.

10 years agoAdd some assumptions.
Dmitry Stogov [Tue, 24 Mar 2015 09:22:11 +0000 (12:22 +0300)]
Add some assumptions.

10 years agoIntroduce ZEND_ASSUME() macro to help optimizing code.
Dmitry Stogov [Tue, 24 Mar 2015 09:21:06 +0000 (12:21 +0300)]
Introduce ZEND_ASSUME() macro to help optimizing code.
Reuse ZEND_ASSERT() conditions for optimization.

10 years agofix test
Anatol Belski [Mon, 23 Mar 2015 21:21:30 +0000 (22:21 +0100)]
fix test

10 years agocleanup mod version macros and mod defs, round x
Anatol Belski [Mon, 23 Mar 2015 20:30:22 +0000 (21:30 +0100)]
cleanup mod version macros and mod defs, round x

10 years agocleanup mod version macros, round 3
Anatol Belski [Mon, 23 Mar 2015 19:54:55 +0000 (20:54 +0100)]
cleanup mod version macros, round 3

10 years agocleanup the mod version macros, round 2
Anatol Belski [Mon, 23 Mar 2015 19:33:54 +0000 (20:33 +0100)]
cleanup the mod version macros, round 2

10 years agocleaning up the version macros
Anatol Belski [Mon, 23 Mar 2015 19:13:59 +0000 (20:13 +0100)]
cleaning up the version macros

10 years agoexport useful symbols from ext/simplexml
Anatol Belski [Mon, 23 Mar 2015 17:33:37 +0000 (18:33 +0100)]
export useful symbols from ext/simplexml

10 years agosome more UPGRADING INTERNALS notes
Anatol Belski [Mon, 23 Mar 2015 14:50:13 +0000 (15:50 +0100)]
some more UPGRADING INTERNALS notes

10 years agosome UPGRADING.INTERNALS notes
Anatol Belski [Mon, 23 Mar 2015 14:27:26 +0000 (15:27 +0100)]
some UPGRADING.INTERNALS notes

10 years agorevert yet unready stuff
Anatol Belski [Mon, 23 Mar 2015 14:08:35 +0000 (15:08 +0100)]
revert yet unready stuff

10 years agomore fixes to the shared compilation
Anatol Belski [Mon, 23 Mar 2015 13:47:07 +0000 (14:47 +0100)]
more fixes to the shared compilation

10 years agofix exports and shared compilation
Anatol Belski [Mon, 23 Mar 2015 13:43:56 +0000 (14:43 +0100)]
fix exports and shared compilation

10 years agofix exports
Anatol Belski [Mon, 23 Mar 2015 13:26:46 +0000 (14:26 +0100)]
fix exports

10 years agoindicate if an ext was forced shared globally
Anatol Belski [Mon, 23 Mar 2015 12:41:00 +0000 (13:41 +0100)]
indicate if an ext was forced shared globally

10 years agofix shared compilation
Anatol Belski [Mon, 23 Mar 2015 12:08:32 +0000 (13:08 +0100)]
fix shared compilation

10 years agoimplemented --with-all-shared option
Anatol Belski [Mon, 23 Mar 2015 11:09:44 +0000 (12:09 +0100)]
implemented --with-all-shared option