[PHP-CVS] com php-src: Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement: sapi/cli/tests/cli_process_title_windows.phpt

2013-09-20 Thread Anatol Belski 
Commit:8f146c2bb0dcba3307f08a839554be056e660f34
Author:Anatol Belski a...@php.net Fri, 20 Sep 2013 15:59:33 +0200
Parents:   dfa43d55dd996fb06c7bb4d5efcae3fc78131cdc
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=8f146c2bb0dcba3307f08a839554be056e660f34

Log:
Fixed bug #65678 the test cli_process_title_windows will fails on particular 
environnement

Patch by Pierre Renaudet

Bugs:
https://bugs.php.net/65678

Changed paths:
  M  sapi/cli/tests/cli_process_title_windows.phpt


Diff:
diff --git a/sapi/cli/tests/cli_process_title_windows.phpt 
b/sapi/cli/tests/cli_process_title_windows.phpt
index 309c09c..472f9c1 100644
--- a/sapi/cli/tests/cli_process_title_windows.phpt
+++ b/sapi/cli/tests/cli_process_title_windows.phpt
@@ -20,7 +20,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
 // no warnings/errors.
 
 $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)
 {
   echo Get-Host failed\n;
@@ -28,7 +28,8 @@ if ($ps_output === null)
 }
 
 $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;
 
 echo *** Testing setting the process title ***\n;
@@ -45,7 +46,7 @@ if ($is_windows8)
 }
 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)
   {


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Fix the broken sh syntax in ext/imap/config.m4.: NEWS ext/imap/config.m4

2013-09-20 Thread Adam Harvey 
Commit:cc66eaa04b123bdfb6aaa7305713fa508640999e
Author:Adam Harvey ahar...@php.net Fri, 20 Sep 2013 14:15:19 -0700
Parents:   d5ba2d8a99653521ff6a7997bf9aabe2b016c89a
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=cc66eaa04b123bdfb6aaa7305713fa508640999e

Log:
Fix the broken sh syntax in ext/imap/config.m4.

Patch by ryotakatsuki at gmail dot com. Fixes bug #65721 (configure script
broken in 5.5.4 and 5.4.20 when enabling imap).

Bugs:
https://bugs.php.net/65721

Changed paths:
  M  NEWS
  M  ext/imap/config.m4


Diff:
diff --git a/NEWS b/NEWS
index 6d94980..bb170e7 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,10 @@ PHP  
  NEWS
   . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain 
names).
 (Syra)
 
+- IMAP:
+  . Fixed bug #65721 (configure script broken in 5.5.4 and 5.4.20 when enabling
+imap). (ryotakatsuki at gmail dot com)
+
 ?? ??? 2013, PHP 5.4.20
 
 - Core:
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index d4dcd4c..3fcf674 100644
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -198,9 +198,9 @@ if test $PHP_IMAP != no; then
   AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client 
installation.)
 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 21
-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 21
 fi


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS ext/imap/config.m4

2013-09-20 Thread Adam Harvey 
Commit:3f64d35559241fa69b95052faaa4ae93e745c1c6
Author:Adam Harvey ahar...@php.net Fri, 20 Sep 2013 14:19:01 -0700
Parents:   8f146c2bb0dcba3307f08a839554be056e660f34 
cc66eaa04b123bdfb6aaa7305713fa508640999e
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=3f64d35559241fa69b95052faaa4ae93e745c1c6

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix the broken sh syntax in ext/imap/config.m4.

Changed paths:
  MM  NEWS
  MM  ext/imap/config.m4


Diff:
diff --cc NEWS
index 7b37e07,bb170e7..aa3f8d2
--- a/NEWS
+++ b/NEWS
@@@ -5,28 -5,21 +5,32 @@@ PH
  - CLI server:
. Fixed bug #65633 (built-in server treat some http headers as
  case-sensitive). (Adam)
 +  . Added application/pdf to PHP CLI Web Server mime types (Chris Jones)
  
  - Datetime:
 -  . Fixed bug #64157 (DateTime::createFromFormat() reports confusing error
 -message). (Boro Sitnikovski)
 +  . Fixed bug #65502 (DateTimeImmutable::createFromFormat returns DateTime).
 +(Boro Sitnikovski)
 +  . Fixed bug #65548 (Comparison for DateTimeImmutable doesn't work).
 +(Boro Sitnikovski)
  
 -- Filter:
 -  . Add RFC 6598 IPs to reserved addresses. (Sebastian Nohn)
 -  . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain 
names).
 -(Syra)
 +- GD
 +  . Ensure that the defined interpolation method is used with the generic
 +scaling methods. (Pierre)
  
+ - IMAP:
+   . Fixed bug #65721 (configure script broken in 5.5.4 and 5.4.20 when 
enabling
+ imap). (ryotakatsuki at gmail dot com)
+ 
 -?? ??? 2013, PHP 5.4.20
 +- OPcache:
 +  . Fixed bug #65665 (Exception not properly caught when opcache enabled).
 +(Laruence)
 +  . Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var). (Dmitry)
 +
 +- SPL:
 +  . Fix bug #64782 (SplFileObject constructor make $context optional / give it
 +a default value). (Nikita)
 +
 +?? ??? 2013, PHP 5.5.4
  
  - Core:
. Fixed bug #60598 (cli/apache sapi segfault on objects manipulation).


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php