mirror of
https://github.com/php/php-src.git
synced 2024-10-02 23:36:16 +00:00
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src: Fix the broken sh syntax in ext/imap/config.m4. Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
This commit is contained in:
commit
b3a17e53f3
@ -198,9 +198,9 @@ if test "$PHP_IMAP" != "no"; then
|
|||||||
AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
|
AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test ! -r "$IMAP_DIR/c-client/libc-client.a" && -r "$IMAP_DIR/c-client/c-client.a" ; then
|
if test ! -r "$IMAP_DIR/c-client/libc-client.a" && test -r "$IMAP_DIR/c-client/c-client.a" ; then
|
||||||
ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
|
ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
|
||||||
elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
|
elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
|
||||||
ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
|
ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
|
|||||||
// no warnings/errors.
|
// no warnings/errors.
|
||||||
|
|
||||||
$is_windows8 = false;
|
$is_windows8 = false;
|
||||||
$ps_output = shell_exec("PowerShell \"(Get-Host).UI.RawUI.WindowTitle\"");
|
$ps_output = shell_exec("PowerShell -NoProfile \"(Get-Host).UI.RawUI.WindowTitle\"");
|
||||||
if ($ps_output === null)
|
if ($ps_output === null)
|
||||||
{
|
{
|
||||||
echo "Get-Host failed\n";
|
echo "Get-Host failed\n";
|
||||||
@ -28,7 +28,8 @@ if ($ps_output === null)
|
|||||||
}
|
}
|
||||||
|
|
||||||
$ps_output = trim($ps_output);
|
$ps_output = trim($ps_output);
|
||||||
if (($ps_output == "Windows PowerShell") || ($ps_output == "Administrator: Windows PowerShell"))
|
$end_title_windows8 = ": Windows PowerShell";
|
||||||
|
if (($ps_output == "Windows PowerShell") || (strlen($ps_output) > strlen($end_title_windows8) && substr($ps_output,-strlen($end_title_windows8)) === $end_title_windows8))
|
||||||
$is_windows8 = true;
|
$is_windows8 = true;
|
||||||
|
|
||||||
echo "*** Testing setting the process title ***\n";
|
echo "*** Testing setting the process title ***\n";
|
||||||
@ -45,7 +46,7 @@ if ($is_windows8)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$loaded_title = shell_exec("PowerShell \"get-process cmd*,powershell* | Select-Object mainWindowTitle | ft -hide\"");
|
$loaded_title = shell_exec("PowerShell -NoProfile \"get-process cmd*,powershell* | Select-Object mainWindowTitle | ft -hide\"");
|
||||||
|
|
||||||
if ($loaded_title === null)
|
if ($loaded_title === null)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user