[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    Re: [PHP-CVS] com php-src: Fix ZTS build: ext/standard/crypt.c
From:       Yasuo Ohgaki <yohgaki () ohgaki ! net>
Date:       2013-10-30 22:41:16
Message-ID: CAGa2bXYAZT3SJn09WvU6-hGtVOE25+UvOeLp2Q2Ghe4B-NBexg () mail ! gmail ! com
[Download RAW message or body]


Thank you, Nikita!

--
Yasuo Ohgaki
yohgaki@ohgaki.net


On Wed, Oct 30, 2013 at 4:01 AM, Nikita Popov <nikic@php.net> wrote:

> Commit:    82eca388d201aa39984521694c92f1955d646838
> Author:    Nikita Popov <nikic@php.net>         Tue, 29 Oct 2013 20:01:37
> +0100
> Parents:   4295bfeeaff4218d77e07d775b88e610d83869b2
> Branches:  master
>
> Link:
> http://git.php.net/?p=php-src.git;a=commitdiff;h=82eca388d201aa39984521694c92f1955d646838
>
> Log:
> Fix ZTS build
>
> Changed paths:
>   M  ext/standard/crypt.c
>
>
> Diff:
> diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
> index 81c0bf3..354c263 100644
> --- a/ext/standard/crypt.c
> +++ b/ext/standard/crypt.c
> @@ -273,7 +273,7 @@ PHP_FUNCTION(crypt)
>         if (salt_in) {
>                 memcpy(salt, salt_in, MIN(PHP_MAX_SALT_LEN, salt_in_len));
>         } else {
> -               php_error_docref(NULL TSRMLS_C, E_NOTICE, "No salt
> parameter was specified. You must use a randomly generated salt and a
> strong hash function to produce a secure hash.");
> +               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "No salt
> parameter was specified. You must use a randomly generated salt and a
> strong hash function to produce a secure hash.");
>         }
>
>         /* The automatic salt generation covers standard DES, md5-crypt
> and Blowfish (simple) */
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>


[prev in list] [next in list] [prev in thread] [next in thread]