]> granicus.if.org Git - php/log
php
10 years agoupdated NEWS
Anatol Belski [Fri, 12 Dec 2014 11:17:42 +0000 (12:17 +0100)]
updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Fri, 12 Dec 2014 11:05:47 +0000 (12:05 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #68583 Crash in timeout thread

Conflicts:
Zend/zend_execute.h

10 years agoFixed bug #68583 Crash in timeout thread
Anatol Belski [Fri, 12 Dec 2014 09:43:31 +0000 (10:43 +0100)]
Fixed bug #68583 Crash in timeout thread

This replaces the GUI element used for execution timeout handling
on Windows. Instead a timer queue technique is used, which is indeed
a thread pool. A timer queue timer is a lightweight object handled
but that thread pool and the timer thread spends most of the time
sleeping and waiting for an alert.

Please note also that this introduces neither binary nor source
breach. The custom timeout thread functions are deleted, however
they was not exported throug DLL, so couldn't be used by any
external code. As well they couldn't be used anywhere in the core
except in executor api, because those custom timeout thread
functions they used to operate on static variables which would
be overwritten (and that would blow).

So instead a relatively modern technique is used for the timeout
handling. It's still not perfect because the executor still has to
check EX(timed_out). This can be a topic for an improvement in
master. But brobably can be tricky as currently it seems to be not
possible to signal an individual thread. Also note another issue
that static variables aren't thread safe, but the current timer
implementation is.

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Wed, 10 Dec 2014 12:22:52 +0000 (13:22 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  move the test to the right place

10 years agomove the test to the right place
Anatol Belski [Wed, 10 Dec 2014 12:19:51 +0000 (13:19 +0100)]
move the test to the right place

10 years agoupdated NEWS
Anatol Belski [Wed, 10 Dec 2014 10:49:13 +0000 (11:49 +0100)]
updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Wed, 10 Dec 2014 10:47:34 +0000 (11:47 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #68545 NULL pointer dereference in unserialize.c

Conflicts:
ext/standard/var_unserializer.c

10 years agoFixed bug #68545 NULL pointer dereference in unserialize.c
Anatol Belski [Wed, 10 Dec 2014 10:43:33 +0000 (11:43 +0100)]
Fixed bug #68545 NULL pointer dereference in unserialize.c

10 years agoUpdated NEWS
Julien Pauli [Wed, 10 Dec 2014 10:23:40 +0000 (11:23 +0100)]
Updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Julien Pauli [Wed, 10 Dec 2014 10:22:46 +0000 (11:22 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS

10 years agoUpdated NEWS
Julien Pauli [Wed, 10 Dec 2014 10:22:28 +0000 (11:22 +0100)]
Updated NEWS

10 years agoNEWS
Remi Collet [Wed, 10 Dec 2014 07:19:04 +0000 (08:19 +0100)]
NEWS

10 years agoFix bug #68526 Implement POSIX Access Control List for UDS
Remi Collet [Wed, 10 Dec 2014 07:15:21 +0000 (08:15 +0100)]
Fix bug #68526 Implement POSIX Access Control List for UDS

- add --with-fpm-acl build option which allow to manage ACL
on Unix Domain Socket
- add listen.acl_users pool option
- add listen.acl_groups pool option

Keep old behavior (chmod) if option not used or not supported.

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Mon, 8 Dec 2014 11:06:50 +0000 (11:06 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoMerge branch 'day-of-week-issues' into PHP-5.5
Derick Rethans [Mon, 8 Dec 2014 11:06:41 +0000 (11:06 +0000)]
Merge branch 'day-of-week-issues' into PHP-5.5

10 years agoFixed day_of_week function as it could sometimes return negative values internally.
Derick Rethans [Mon, 8 Dec 2014 11:06:12 +0000 (11:06 +0000)]
Fixed day_of_week function as it could sometimes return negative values internally.

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Dmitry Stogov [Mon, 8 Dec 2014 09:24:16 +0000 (12:24 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed possible read after end of buffer and use after free.

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Mon, 8 Dec 2014 09:20:01 +0000 (12:20 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed possible read after end of buffer and use after free.

10 years agoFixed possible read after end of buffer and use after free.
Dmitry Stogov [Mon, 8 Dec 2014 09:18:27 +0000 (12:18 +0300)]
Fixed possible read after end of buffer and use after free.

10 years agoFixed bug #68398 msooxml matches too many archives
Anatol Belski [Sat, 6 Dec 2014 19:51:00 +0000 (20:51 +0100)]
Fixed bug #68398 msooxml matches too many archives

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Sat, 6 Dec 2014 11:31:55 +0000 (12:31 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed test

10 years agofixed test
Anatol Belski [Sat, 6 Dec 2014 11:31:27 +0000 (12:31 +0100)]
fixed test

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Sat, 6 Dec 2014 11:18:05 +0000 (12:18 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  C89 compat
  add include for missing localeconv_r proto

10 years agoC89 compat
Anatol Belski [Sat, 6 Dec 2014 11:14:17 +0000 (12:14 +0100)]
C89 compat

10 years agoadd include for missing localeconv_r proto
Anatol Belski [Sat, 6 Dec 2014 11:09:35 +0000 (12:09 +0100)]
add include for missing localeconv_r proto

10 years agoupdated NEWS
Anatol Belski [Sat, 6 Dec 2014 11:00:39 +0000 (12:00 +0100)]
updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Sat, 6 Dec 2014 11:00:17 +0000 (12:00 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #65230 setting locale randomly broken

10 years agoFixed bug #65230 setting locale randomly broken
Anatol Belski [Sat, 6 Dec 2014 10:59:43 +0000 (11:59 +0100)]
Fixed bug #65230 setting locale randomly broken

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Matteo Beccati [Sat, 6 Dec 2014 09:24:27 +0000 (10:24 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix compilation error (ref #68424)

10 years agoFix compilation error (ref #68424)
Matteo Beccati [Sat, 6 Dec 2014 09:23:56 +0000 (10:23 +0100)]
Fix compilation error (ref #68424)

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Adam Harvey [Fri, 5 Dec 2014 21:58:19 +0000 (13:58 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Revert unintentional docblock change

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Adam Harvey [Fri, 5 Dec 2014 21:57:46 +0000 (13:57 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert unintentional docblock change

10 years agoRevert unintentional docblock change
Chris Christoff [Fri, 5 Dec 2014 20:59:46 +0000 (15:59 -0500)]
Revert unintentional docblock change

Revert unintentional docblock change

It looks like commit dd8e59da8f5aafd9d77a0f1f17e5e272d09f643f
introduced an unintended docbloc change. I have reverted this
change in this commit.

10 years agoUpdated NEWS
Julien Pauli [Fri, 5 Dec 2014 16:06:16 +0000 (17:06 +0100)]
Updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Julien Pauli [Fri, 5 Dec 2014 16:05:37 +0000 (17:05 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS
  Start adding new attribute to control multi statements

10 years agoUpdated NEWS
Julien Pauli [Fri, 5 Dec 2014 16:05:21 +0000 (17:05 +0100)]
Updated NEWS

10 years agoStart adding new attribute to control multi statements
pwolanin [Fri, 7 Nov 2014 22:18:44 +0000 (17:18 -0500)]
Start adding new attribute to control multi statements

10 years agoupdated NEWS
Anatol Belski [Fri, 5 Dec 2014 14:51:26 +0000 (15:51 +0100)]
updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Fri, 5 Dec 2014 14:50:18 +0000 (15:50 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  . Fixed bug #68120 Update bundled libsqlite

Conflicts:
ext/sqlite3/libsqlite/sqlite3.c

10 years ago. Fixed bug #68120 Update bundled libsqlite
Anatol Belski [Fri, 5 Dec 2014 14:43:53 +0000 (15:43 +0100)]
. Fixed bug #68120 Update bundled libsqlite

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Fri, 5 Dec 2014 10:08:55 +0000 (11:08 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #65769 localeconv() broken in TS builds

10 years agoupdated NEWS
Anatol Belski [Fri, 5 Dec 2014 10:08:32 +0000 (11:08 +0100)]
updated NEWS

10 years agoFixed bug #65769 localeconv() broken in TS builds
Anatol Belski [Fri, 5 Dec 2014 10:06:06 +0000 (11:06 +0100)]
Fixed bug #65769 localeconv() broken in TS builds

10 years agoUpdated NEWS
Julien Pauli [Fri, 5 Dec 2014 09:12:35 +0000 (10:12 +0100)]
Updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Julien Pauli [Fri, 5 Dec 2014 09:12:08 +0000 (10:12 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS
  Fixed #68479 - Added escape parameter to SplFileObject::fputcsv

10 years agoUpdated NEWS
Julien Pauli [Fri, 5 Dec 2014 09:11:49 +0000 (10:11 +0100)]
Updated NEWS

10 years agoFixed #68479 - Added escape parameter to SplFileObject::fputcsv
Peter Cowburn [Mon, 24 Nov 2014 20:13:14 +0000 (20:13 +0000)]
Fixed #68479 - Added escape parameter to SplFileObject::fputcsv

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Fri, 5 Dec 2014 06:08:35 +0000 (07:08 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix dir separators in test

10 years agofix dir separators in test
Anatol Belski [Fri, 5 Dec 2014 06:07:58 +0000 (07:07 +0100)]
fix dir separators in test

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.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 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 agoFixed __debugInfo() support
Dmitry Stogov [Wed, 3 Dec 2014 09:13:01 +0000 (12:13 +0300)]
Fixed __debugInfo() support

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 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 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 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 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 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 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.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 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 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.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.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