]>
granicus.if.org Git - php/log
Anatol Belski [Wed, 3 Dec 2014 18:50:02 +0000 (19:50 +0100)]
fix TS build
Anatol Belski [Tue, 2 Dec 2014 14:59:38 +0000 (15:59 +0100)]
add config option to target codegen architectures
Anatol Belski [Wed, 3 Dec 2014 15:49:13 +0000 (16:49 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
Fixed bug #55541 errors spawn MessageBox, which blocks test automation
Anatol Belski [Wed, 3 Dec 2014 15:48:49 +0000 (16:48 +0100)]
updated NEWS
Anatol Belski [Wed, 3 Dec 2014 15:48:07 +0000 (16:48 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Fixed bug #55541 errors spawn MessageBox, which blocks test automation
Anatol Belski [Wed, 3 Dec 2014 15:47:38 +0000 (16:47 +0100)]
updated NEWS
Anatol Belski [Wed, 3 Dec 2014 15:33:05 +0000 (16:33 +0100)]
Fixed bug #55541 errors spawn MessageBox, which blocks test automation
With that, also fixed bug #68297 (Application Popup provides too few
information) as a better error message is provided to the event log.
In the second case, the condition for display_startup_error was removed. The
condition was added as a fix for bug #30760 which was preventing the
MessageBox to appear. When display_startup_error=on, the error will be seen
on the console. But when running under a webserver it'll probably get lost,
so we need to log it other way into the event log (would be done automatically
when message box was used, but that would eventually cause issues of blocked
execution).
Generally speaking - any MessageBox or other graphical element is a potential
issue and that was repeatedly reported. Graphical elements shouldn't be used
in the core. Even being a rare one it can cause a bad situation where the
server is blocked. Yet some places have to cleaned up.
Dmitry Stogov [Wed, 3 Dec 2014 15:02:02 +0000 (18:02 +0300)]
Get rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are absolutely the same).
Dmitry Stogov [Wed, 3 Dec 2014 13:56:09 +0000 (16:56 +0300)]
Use zend_string* for op_array->arg_info[]->name and op_array->arg_info[]->class_name. For internal functions we still use char*.
Dmitry Stogov [Wed, 3 Dec 2014 09:13:50 +0000 (12:13 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed __debugInfo() support
Dmitry Stogov [Wed, 3 Dec 2014 09:13:01 +0000 (12:13 +0300)]
Fixed __debugInfo() support
Adam Harvey [Wed, 3 Dec 2014 00:48:12 +0000 (16:48 -0800)]
Merge branch 'PHP-5.6'
Adam Harvey [Wed, 3 Dec 2014 00:47:31 +0000 (16:47 -0800)]
Update UPGRADING for the new variadic functions, and re-sort.
Dmitry Stogov [Tue, 2 Dec 2014 23:47:03 +0000 (02:47 +0300)]
Improved POST INC/DEC
Ferenc Kovacs [Tue, 2 Dec 2014 18:19:30 +0000 (19:19 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
Ferenc Kovacs [Tue, 2 Dec 2014 18:19:16 +0000 (19:19 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
Ferenc Kovacs [Tue, 2 Dec 2014 18:18:57 +0000 (19:18 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
Conflicts:
run-tests.php
Ferenc Kovacs [Tue, 2 Dec 2014 18:17:58 +0000 (19:17 +0100)]
make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
Xinchen Hui [Tue, 2 Dec 2014 14:21:35 +0000 (22:21 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Tue, 2 Dec 2014 14:21:19 +0000 (22:21 +0800)]
Missed closed folder mark
Dmitry Stogov [Tue, 2 Dec 2014 13:47:26 +0000 (16:47 +0300)]
Revert "Unecessary assignment"
This reverts commit
b19333663a872a8b0b8c799781236b5cd5bfa47a .
Dmitry Stogov [Tue, 2 Dec 2014 13:29:54 +0000 (16:29 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Unecessary assignment
Dmitry Stogov [Tue, 2 Dec 2014 13:29:13 +0000 (16:29 +0300)]
Fixed improper memory release
Xinchen Hui [Tue, 2 Dec 2014 13:24:00 +0000 (21:24 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Tue, 2 Dec 2014 13:23:39 +0000 (21:23 +0800)]
Unecessary assignment
Dmitry Stogov [Tue, 2 Dec 2014 13:17:26 +0000 (16:17 +0300)]
Support for different CPU page sizes
Dmitry Stogov [Tue, 2 Dec 2014 13:05:30 +0000 (16:05 +0300)]
Fixed "finally" handling (the bug was introduced by recent removing of EX(delayed_exception))
Anatol Belski [Tue, 2 Dec 2014 10:24:21 +0000 (11:24 +0100)]
fix datatype mismatches and warnings
Anatol Belski [Tue, 2 Dec 2014 09:02:20 +0000 (10:02 +0100)]
add /nologo to ARFLAGS
Anatol Belski [Tue, 2 Dec 2014 08:14:22 +0000 (09:14 +0100)]
fix datatype mismatches
Anatol Belski [Tue, 2 Dec 2014 07:58:39 +0000 (08:58 +0100)]
fix datatype mismatches
Anatol Belski [Tue, 2 Dec 2014 07:37:11 +0000 (08:37 +0100)]
fix datatype mismatch
Anatol Belski [Mon, 1 Dec 2014 13:30:02 +0000 (14:30 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 1 Dec 2014 07:42:21 +0000 (08:42 +0100)]
silence the lib.exe
Remi Collet [Tue, 2 Dec 2014 07:41:35 +0000 (08:41 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Fix Bug #68536 Pack for 64bits integer is broken on bigendian.
Remi Collet [Tue, 2 Dec 2014 07:40:52 +0000 (08:40 +0100)]
NEWS
Remi Collet [Tue, 2 Dec 2014 07:38:39 +0000 (08:38 +0100)]
Fix Bug #68536 Pack for 64bits integer is broken on bigendian.
Covered by ext/standard/tests/strings/pack64.phpt
Remi Collet [Tue, 2 Dec 2014 06:41:35 +0000 (07:41 +0100)]
fix string is optional, set default length, thanks laruence
Remi Collet [Tue, 2 Dec 2014 06:05:13 +0000 (07:05 +0100)]
Fix type of string length in zpp call
Fix 23 failed tests (detected on bigendian)
Anatol Belski [Mon, 1 Dec 2014 18:10:44 +0000 (19:10 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
one more refix to the test
Anatol Belski [Mon, 1 Dec 2014 18:10:18 +0000 (19:10 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
one more refix to the test
Anatol Belski [Mon, 1 Dec 2014 18:09:39 +0000 (19:09 +0100)]
one more refix to the test
Remi Collet [Mon, 1 Dec 2014 18:06:16 +0000 (19:06 +0100)]
cleanup uneeded cast
Anatol Belski [Mon, 1 Dec 2014 17:56:14 +0000 (18:56 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix dir separator in test
Anatol Belski [Mon, 1 Dec 2014 17:55:52 +0000 (18:55 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix dir separator in test
Anatol Belski [Mon, 1 Dec 2014 17:55:20 +0000 (18:55 +0100)]
fix dir separator in test
Remi Collet [Mon, 1 Dec 2014 15:09:15 +0000 (16:09 +0100)]
Fix type of string lengths.
Those values are used in various call (including zpp) where
a size_t is expected.
This fix 82 failed test on ppc64
(bigendian is perfect to detect stack issue)
Anatol Belski [Mon, 1 Dec 2014 13:43:43 +0000 (14:43 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix possible null pointer math
Anatol Belski [Mon, 1 Dec 2014 13:43:22 +0000 (14:43 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix possible null pointer math
Anatol Belski [Mon, 1 Dec 2014 13:40:35 +0000 (14:40 +0100)]
fix possible null pointer math
Gustavo Frederico Temple Pedrosa [Tue, 25 Nov 2014 15:41:15 +0000 (15:41 +0000)]
PowerPC64 support in long multiplication
In long integer multiplications, avoid casting
both operands to long double and use an inline
assembly-based overflow checking function instead.
Ferenc Kovacs [Mon, 1 Dec 2014 09:15:42 +0000 (10:15 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Revert "don't try to send in the test results until we restored qa.php.net" as qa.php.net is back.
Ferenc Kovacs [Mon, 1 Dec 2014 09:14:32 +0000 (10:14 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Revert "don't try to send in the test results until we restored qa.php.net" as qa.php.net is back.
Conflicts:
.travis.yml
Ferenc Kovacs [Mon, 1 Dec 2014 09:12:06 +0000 (10:12 +0100)]
Revert "don't try to send in the test results until we restored qa.php.net" as qa.php.net is back.
This reverts commit
551593707384364705cd954a52c6e4089805f0ef .
Anatol Belski [Mon, 1 Dec 2014 07:32:12 +0000 (08:32 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add include for missing usleep proto
C89 compat
Added more useful warning messages
Changed based on comments and make its behaviour equal to the Windows version
Fix #53092 - dns_get_record does not return false on dns server failure
Fix php cli (-S option) inconsistent port parsing
Conflicts:
main/streams/plain_wrapper.c
Anatol Belski [Mon, 1 Dec 2014 07:30:59 +0000 (08:30 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add include for missing usleep proto
C89 compat
Added more useful warning messages
Changed based on comments and make its behaviour equal to the Windows version
Fix #53092 - dns_get_record does not return false on dns server failure
Fix php cli (-S option) inconsistent port parsing
Anatol Belski [Mon, 1 Dec 2014 07:27:46 +0000 (08:27 +0100)]
add include for missing usleep proto
Anatol Belski [Mon, 1 Dec 2014 07:24:44 +0000 (08:24 +0100)]
C89 compat
Stanislav Malyshev [Mon, 1 Dec 2014 06:44:02 +0000 (22:44 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Added more useful warning messages
Changed based on comments and make its behaviour equal to the Windows version
Fix #53092 - dns_get_record does not return false on dns server failure
Fix php cli (-S option) inconsistent port parsing
Tjerk Meesters [Tue, 15 Jul 2014 12:28:16 +0000 (20:28 +0800)]
Added more useful warning messages
Tjerk Meesters [Tue, 15 Jul 2014 12:12:33 +0000 (20:12 +0800)]
Changed based on comments and make its behaviour equal to the Windows version
Tjerk Meesters [Sun, 13 Jul 2014 10:23:25 +0000 (18:23 +0800)]
Fix #53092 - dns_get_record does not return false on dns server failure
nil0x42 [Fri, 11 Jul 2014 17:48:03 +0000 (19:48 +0200)]
Fix php cli (-S option) inconsistent port parsing
Add port range verification of listening port with -S option for the php cli.
This fixes inconsistent listening port due to unverified cast from long to short
with htons(3).
Tjerk Meesters [Tue, 15 Jul 2014 12:28:16 +0000 (20:28 +0800)]
Added more useful warning messages
Tjerk Meesters [Tue, 15 Jul 2014 12:12:33 +0000 (20:12 +0800)]
Changed based on comments and make its behaviour equal to the Windows version
Tjerk Meesters [Sun, 13 Jul 2014 10:23:25 +0000 (18:23 +0800)]
Fix #53092 - dns_get_record does not return false on dns server failure
nil0x42 [Fri, 11 Jul 2014 17:48:03 +0000 (19:48 +0200)]
Fix php cli (-S option) inconsistent port parsing
Add port range verification of listening port with -S option for the php cli.
This fixes inconsistent listening port due to unverified cast from long to short
with htons(3).
Tjerk Meesters [Tue, 15 Jul 2014 12:28:16 +0000 (20:28 +0800)]
Added more useful warning messages
Tjerk Meesters [Tue, 15 Jul 2014 12:12:33 +0000 (20:12 +0800)]
Changed based on comments and make its behaviour equal to the Windows version
Tjerk Meesters [Sun, 13 Jul 2014 10:23:25 +0000 (18:23 +0800)]
Fix #53092 - dns_get_record does not return false on dns server failure
nil0x42 [Fri, 11 Jul 2014 17:48:03 +0000 (19:48 +0200)]
Fix php cli (-S option) inconsistent port parsing
Add port range verification of listening port with -S option for the php cli.
This fixes inconsistent listening port due to unverified cast from long to short
with htons(3).
Remi Collet [Mon, 1 Dec 2014 06:29:19 +0000 (07:29 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
XFAIL as catch_workers_output = yes seems not reliable
Remi Collet [Mon, 1 Dec 2014 06:28:49 +0000 (07:28 +0100)]
XFAIL as catch_workers_output = yes seems not reliable
Stanislav Malyshev [Mon, 1 Dec 2014 06:22:50 +0000 (22:22 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update NEWS
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
fix ZTS
Conflicts:
ext/curl/multi.c
ext/date/php_date.c
Stanislav Malyshev [Mon, 1 Dec 2014 06:22:15 +0000 (22:22 -0800)]
Merge branch 'pull-request/728'
* pull-request/728:
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
Conflicts:
ext/curl/multi.c
Stanislav Malyshev [Mon, 1 Dec 2014 06:21:35 +0000 (22:21 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
Stanislav Malyshev [Mon, 1 Dec 2014 06:19:24 +0000 (22:19 -0800)]
update NEWS
Jille Timmermans [Mon, 24 Nov 2014 08:37:55 +0000 (09:37 +0100)]
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
Jille Timmermans [Thu, 17 Jul 2014 15:21:52 +0000 (17:21 +0200)]
Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
Stanislav Malyshev [Mon, 1 Dec 2014 05:50:29 +0000 (21:50 -0800)]
fix ZTS
Stanislav Malyshev [Mon, 1 Dec 2014 05:41:04 +0000 (21:41 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update news
update news
update NEWS
Apply error-code-salt fix to Windows too
Bug fixes in light of failing bcrypt tests
Add tests from 1.3. Add missing tests.
Upgrade crypt_blowfish to version 1.3
Apply error-code-salt fix to Windows too
Bug fixes in light of failing bcrypt tests
Add tests from 1.3. Add missing tests.
Upgrade crypt_blowfish to version 1.3
Conflicts:
ext/standard/crypt.c
Stanislav Malyshev [Mon, 1 Dec 2014 05:39:26 +0000 (21:39 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update news
update news
update NEWS
Apply error-code-salt fix to Windows too
Bug fixes in light of failing bcrypt tests
Add tests from 1.3. Add missing tests.
Upgrade crypt_blowfish to version 1.3
Apply error-code-salt fix to Windows too
Bug fixes in light of failing bcrypt tests
Add tests from 1.3. Add missing tests.
Upgrade crypt_blowfish to version 1.3
Stanislav Malyshev [Mon, 1 Dec 2014 05:38:30 +0000 (21:38 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update news
Conflicts:
ext/standard/crypt.c
Stanislav Malyshev [Mon, 1 Dec 2014 05:12:03 +0000 (21:12 -0800)]
update news
Stanislav Malyshev [Mon, 1 Dec 2014 05:12:17 +0000 (21:12 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update news
Apply error-code-salt fix to Windows too
Bug fixes in light of failing bcrypt tests
Add tests from 1.3. Add missing tests.
Upgrade crypt_blowfish to version 1.3
Stanislav Malyshev [Mon, 1 Dec 2014 05:12:03 +0000 (21:12 -0800)]
update news
Stanislav Malyshev [Mon, 1 Dec 2014 05:11:20 +0000 (21:11 -0800)]
update NEWS
Stanislav Malyshev [Mon, 1 Dec 2014 05:09:41 +0000 (21:09 -0800)]
Merge branch 'pull-request/868' into PHP-5.5
* pull-request/868:
Apply error-code-salt fix to Windows too
Bug fixes in light of failing bcrypt tests
Add tests from 1.3. Add missing tests.
Upgrade crypt_blowfish to version 1.3
Leigh [Tue, 7 Oct 2014 12:12:38 +0000 (13:12 +0100)]
Apply error-code-salt fix to Windows too
Conflicts:
ext/standard/crypt.c
Leigh [Tue, 7 Oct 2014 11:27:57 +0000 (12:27 +0100)]
Bug fixes in light of failing bcrypt tests
Conflicts:
ext/standard/crypt.c
Leigh [Tue, 7 Oct 2014 10:50:36 +0000 (11:50 +0100)]
Add tests from 1.3. Add missing tests.
3 of the missing tests fail. // TODO
Leigh [Tue, 7 Oct 2014 10:23:24 +0000 (11:23 +0100)]
Upgrade crypt_blowfish to version 1.3
Stanislav Malyshev [Mon, 1 Dec 2014 04:50:43 +0000 (20:50 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Conflicts: ext/date/php_date.c
Conflicts:
ext/date/php_date.c
m.bennewitz [Mon, 20 Oct 2014 08:27:56 +0000 (08:27 +0000)]
Conflicts:
ext/date/php_date.c
Stanislav Malyshev [Mon, 1 Dec 2014 04:37:37 +0000 (20:37 -0800)]
Merge branch 'pull-request/878'
* pull-request/878:
#68268: DatePeriod: Getter for start date, end date and interval
Stanislav Malyshev [Mon, 1 Dec 2014 04:27:05 +0000 (20:27 -0800)]
Merge branch 'pull-request/877'
* pull-request/877:
gmp_random_seed()
Stanislav Malyshev [Mon, 1 Dec 2014 02:32:56 +0000 (18:32 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Adds test cases for openssl EC improvements
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
Fixes memory leak introduced in
2b9af967
Conflicts:
ext/openssl/openssl.c
Stanislav Malyshev [Mon, 1 Dec 2014 02:27:37 +0000 (18:27 -0800)]
Merge branch 'pull-request/916'
* pull-request/916:
Adds test cases for openssl EC improvements
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
Stanislav Malyshev [Mon, 1 Dec 2014 02:26:39 +0000 (18:26 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixes memory leak introduced in
2b9af967
Stanislav Malyshev [Mon, 1 Dec 2014 02:26:17 +0000 (18:26 -0800)]
Merge branch 'pull-request/914' into PHP-5.5
* pull-request/914:
Fixes memory leak introduced in
2b9af967