]> granicus.if.org Git - php/log
php
10 years agoFix zend_fcall_info_arg*() to use ZVAL_COPY
Michael Wallner [Thu, 4 Dec 2014 12:02:30 +0000 (13:02 +0100)]
Fix zend_fcall_info_arg*() to use ZVAL_COPY

As zend_fcall_info_args_clear() calls zval_ptr_dtor() we also have
to increase the refcount of refcounted zvals added as params,
like it is already done in zend_fcall_info_args_ex().

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Thu, 4 Dec 2014 10:12:42 +0000 (11:12 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add initial install
  switch to C travis project instead of PHP
  use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Thu, 4 Dec 2014 10:12:32 +0000 (11:12 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add initial install
  switch to C travis project instead of PHP
  use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)

10 years agoMerge branch 'pull-request/932' into PHP-5.5
Ferenc Kovacs [Thu, 4 Dec 2014 10:12:17 +0000 (11:12 +0100)]
Merge branch 'pull-request/932' into PHP-5.5

* pull-request/932:
  add initial install
  switch to C travis project instead of PHP
  use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)

10 years agoMerge branch 'PHP-5.6'
Tjerk Meesters [Wed, 3 Dec 2014 23:22:54 +0000 (07:22 +0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed #65213 - cannot cast SplFileInfo to boolean

Conflicts:
ext/spl/spl_directory.c

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Tjerk Meesters [Wed, 3 Dec 2014 23:18:33 +0000 (07:18 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed #65213 - cannot cast SplFileInfo to boolean

10 years agoFixed #65213 - cannot cast SplFileInfo to boolean
Tjerk Meesters [Wed, 3 Dec 2014 23:17:33 +0000 (07:17 +0800)]
Fixed #65213 - cannot cast SplFileInfo to boolean

10 years agoadd initial install
Ferenc Kovacs [Wed, 3 Dec 2014 23:12:23 +0000 (00:12 +0100)]
add initial install

10 years agoswitch to C travis project instead of PHP
Ferenc Kovacs [Sun, 18 May 2014 16:15:51 +0000 (18:15 +0200)]
switch to C travis project instead of PHP

10 years agouse the generic TRAVIS environment var to check for travis (see http://docs.travis...
Ferenc Kovacs [Sun, 18 May 2014 18:12:28 +0000 (20:12 +0200)]
use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)

10 years agofix TS build
Anatol Belski [Wed, 3 Dec 2014 18:50:02 +0000 (19:50 +0100)]
fix TS build

10 years agoadd config option to target codegen architectures
Anatol Belski [Tue, 2 Dec 2014 14:59:38 +0000 (15:59 +0100)]
add config option to target codegen architectures

10 years agoMerge branch 'PHP-5.6'
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

10 years agoupdated NEWS
Anatol Belski [Wed, 3 Dec 2014 15:48:49 +0000 (16:48 +0100)]
updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoupdated NEWS
Anatol Belski [Wed, 3 Dec 2014 15:47:38 +0000 (16:47 +0100)]
updated NEWS

10 years agoFixed bug #55541 errors spawn MessageBox, which blocks test automation
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.

10 years agoGet rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are...
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).

10 years agoUse zend_string* for op_array->arg_info[]->name and op_array->arg_info[]->class_name...
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*.

10 years agoMerge branch 'PHP-5.6'
Dmitry Stogov [Wed, 3 Dec 2014 09:13:50 +0000 (12:13 +0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed __debugInfo() support

10 years agoFixed __debugInfo() support
Dmitry Stogov [Wed, 3 Dec 2014 09:13:01 +0000 (12:13 +0300)]
Fixed __debugInfo() support

10 years agoMerge branch 'PHP-5.6'
Adam Harvey [Wed, 3 Dec 2014 00:48:12 +0000 (16:48 -0800)]
Merge branch 'PHP-5.6'

10 years agoUpdate UPGRADING for the new variadic functions, and re-sort.
Adam Harvey [Wed, 3 Dec 2014 00:47:31 +0000 (16:47 -0800)]
Update UPGRADING for the new variadic functions, and re-sort.

10 years agoImproved POST INC/DEC
Dmitry Stogov [Tue, 2 Dec 2014 23:47:03 +0000 (02:47 +0300)]
Improved POST INC/DEC

10 years agoMerge branch 'PHP-5.6'
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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

10 years agomake sure that we don't truncate the stack trace and cause false test failures when...
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

10 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Tue, 2 Dec 2014 14:21:35 +0000 (22:21 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src

10 years agoMissed closed folder mark
Xinchen Hui [Tue, 2 Dec 2014 14:21:19 +0000 (22:21 +0800)]
Missed closed folder mark

10 years agoRevert "Unecessary assignment"
Dmitry Stogov [Tue, 2 Dec 2014 13:47:26 +0000 (16:47 +0300)]
Revert "Unecessary assignment"

This reverts commit b19333663a872a8b0b8c799781236b5cd5bfa47a.

10 years agoMerge branch 'master' of git.php.net:php-src
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

10 years agoFixed improper memory release
Dmitry Stogov [Tue, 2 Dec 2014 13:29:13 +0000 (16:29 +0300)]
Fixed improper memory release

10 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Tue, 2 Dec 2014 13:24:00 +0000 (21:24 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src

10 years agoUnecessary assignment
Xinchen Hui [Tue, 2 Dec 2014 13:23:39 +0000 (21:23 +0800)]
Unecessary assignment

10 years agoSupport for different CPU page sizes
Dmitry Stogov [Tue, 2 Dec 2014 13:17:26 +0000 (16:17 +0300)]
Support for different CPU page sizes

10 years agoFixed "finally" handling (the bug was introduced by recent removing of EX(delayed_exc...
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))

10 years agofix datatype mismatches and warnings
Anatol Belski [Tue, 2 Dec 2014 10:24:21 +0000 (11:24 +0100)]
fix datatype mismatches and warnings

10 years agoadd /nologo to ARFLAGS
Anatol Belski [Tue, 2 Dec 2014 09:02:20 +0000 (10:02 +0100)]
add /nologo to ARFLAGS

10 years agofix datatype mismatches
Anatol Belski [Tue, 2 Dec 2014 08:14:22 +0000 (09:14 +0100)]
fix datatype mismatches

10 years agofix datatype mismatches
Anatol Belski [Tue, 2 Dec 2014 07:58:39 +0000 (08:58 +0100)]
fix datatype mismatches

10 years agofix datatype mismatch
Anatol Belski [Tue, 2 Dec 2014 07:37:11 +0000 (08:37 +0100)]
fix datatype mismatch

10 years agofix datatype mismatches
Anatol Belski [Mon, 1 Dec 2014 13:30:02 +0000 (14:30 +0100)]
fix datatype mismatches

10 years agosilence the lib.exe
Anatol Belski [Mon, 1 Dec 2014 07:42:21 +0000 (08:42 +0100)]
silence the lib.exe

10 years agoMerge branch 'PHP-5.6'
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.

10 years agoNEWS
Remi Collet [Tue, 2 Dec 2014 07:40:52 +0000 (08:40 +0100)]
NEWS

10 years agoFix Bug #68536 Pack for 64bits integer is broken on bigendian.
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

10 years agofix string is optional, set default length, thanks laruence
Remi Collet [Tue, 2 Dec 2014 06:41:35 +0000 (07:41 +0100)]
fix string is optional, set default length, thanks laruence

10 years agoFix type of string length in zpp call
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)

10 years agoMerge branch 'PHP-5.6'
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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoone more refix to the test
Anatol Belski [Mon, 1 Dec 2014 18:09:39 +0000 (19:09 +0100)]
one more refix to the test

10 years agocleanup uneeded cast
Remi Collet [Mon, 1 Dec 2014 18:06:16 +0000 (19:06 +0100)]
cleanup uneeded cast

10 years agoMerge branch 'PHP-5.6'
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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agofix dir separator in test
Anatol Belski [Mon, 1 Dec 2014 17:55:20 +0000 (18:55 +0100)]
fix dir separator in test

10 years agoFix type of string lengths.
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)

10 years agoMerge branch 'PHP-5.6'
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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agofix possible null pointer math
Anatol Belski [Mon, 1 Dec 2014 13:40:35 +0000 (14:40 +0100)]
fix possible null pointer math

10 years agoPowerPC64 support in long multiplication
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.

10 years agoMerge branch 'PHP-5.6'
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.

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoRevert "don't try to send in the test results until we restored qa.php.net" as qa...
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.

10 years agoMerge branch 'PHP-5.6'
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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoadd include for missing usleep proto
Anatol Belski [Mon, 1 Dec 2014 07:27:46 +0000 (08:27 +0100)]
add include for missing usleep proto

10 years agoC89 compat
Anatol Belski [Mon, 1 Dec 2014 07:24:44 +0000 (08:24 +0100)]
C89 compat

10 years agoMerge branch 'PHP-5.6'
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

10 years agoAdded more useful warning messages
Tjerk Meesters [Tue, 15 Jul 2014 12:28:16 +0000 (20:28 +0800)]
Added more useful warning messages

10 years agoChanged based on comments and make its behaviour equal to the Windows version
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

10 years agoFix #53092 - dns_get_record does not return false on dns server failure
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

10 years agoFix php cli (-S option) inconsistent port parsing
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).

10 years agoAdded more useful warning messages
Tjerk Meesters [Tue, 15 Jul 2014 12:28:16 +0000 (20:28 +0800)]
Added more useful warning messages

10 years agoChanged based on comments and make its behaviour equal to the Windows version
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

10 years agoFix #53092 - dns_get_record does not return false on dns server failure
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

10 years agoFix php cli (-S option) inconsistent port parsing
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).

10 years agoAdded more useful warning messages
Tjerk Meesters [Tue, 15 Jul 2014 12:28:16 +0000 (20:28 +0800)]
Added more useful warning messages

10 years agoChanged based on comments and make its behaviour equal to the Windows version
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

10 years agoFix #53092 - dns_get_record does not return false on dns server failure
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

10 years agoFix php cli (-S option) inconsistent port parsing
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).

10 years agoMerge branch 'PHP-5.6'
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

10 years agoXFAIL 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

10 years agoMerge branch 'PHP-5.6'
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

10 years agoMerge branch 'pull-request/728'
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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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)

10 years agoupdate NEWS
Stanislav Malyshev [Mon, 1 Dec 2014 06:19:24 +0000 (22:19 -0800)]
update NEWS

10 years agoAdd a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn...
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)

10 years agoFixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn...
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)

10 years agofix ZTS
Stanislav Malyshev [Mon, 1 Dec 2014 05:50:29 +0000 (21:50 -0800)]
fix ZTS

10 years agoMerge branch 'PHP-5.6'
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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

10 years agoupdate news
Stanislav Malyshev [Mon, 1 Dec 2014 05:12:03 +0000 (21:12 -0800)]
update news

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

10 years agoupdate news
Stanislav Malyshev [Mon, 1 Dec 2014 05:12:03 +0000 (21:12 -0800)]
update news

10 years agoupdate NEWS
Stanislav Malyshev [Mon, 1 Dec 2014 05:11:20 +0000 (21:11 -0800)]
update NEWS

10 years agoMerge branch 'pull-request/868' into PHP-5.5
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

10 years agoApply error-code-salt fix to Windows too
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

10 years agoBug fixes in light of failing bcrypt tests
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