[PHP-CVS] com php-src: sync version: configure.in

2012-04-25 Thread Stanislav Malyshev 
Commit:7d3d38abecf8c0c3897afde68a8d0001a27537cb
Author:Stanislav Malyshev s...@php.net Tue, 24 Apr 2012 16:30:37 
-0700
Parents:   ac4d53cf70c3e50970a339b0920973aa0560b8ec
Branches:  PHP-5.4

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

Log:
sync version

Changed paths:
  M  configure.in


Diff:
diff --git a/configure.in b/configure.in
index 76f3598..edc2455 100644
--- a/configure.in
+++ b/configure.in
@@ -119,8 +119,8 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4
-PHP_RELEASE_VERSION=1
-PHP_EXTRA_VERSION=RC1-dev
+PHP_RELEASE_VERSION=2
+PHP_EXTRA_VERSION=-dev
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`


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

[PHP-CVS] svn: /SVNROOT/ global_avail

2012-04-25 Thread Pierre Joye 
pajoye   Wed, 25 Apr 2012 08:04:15 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=325441

Log:
- wincache karma for Eric

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-04-24 17:01:01 UTC (rev 325440)
+++ SVNROOT/global_avail2012-04-25 08:04:15 UTC (rev 325441)
@@ -327,7 +327,7 @@
 avail|basantk|pecl/memsession
 avail|devour|pecl/geoip
 avail|iekpo|pecl/solr,phpdoc
-avail|ruslany,ksingla,donraman,jennylaw|pecl/wincache,phpdoc
+avail|ruslany,ksingla,donraman,jennylaw,ericsten|pecl/wincache,phpdoc
 avail|pierrick|pecl/stomp,phpdoc,php-src.git/branches/LEMON
 avail|cyberspice|pecl/dio,pecl/framegrab,phpdoc,pecl/dbus
 avail|crodas|pecl/textcat,phpdoc

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

[PHP-CVS] com php-src: Partial fix for bug 61743 to get correct icacls path: ext/standard/tests/file/windows_acls/common.inc

2012-04-25 Thread Anatoliy Belsky 
Commit:433290e199e29f38cfebf54ba213f4abff4e328a
Author:Anatoliy Belsky a...@php.net Wed, 25 Apr 2012 18:38:27 
+0200
Parents:   270a406ac94b5fc5cc9ef59fc61e3b4b95648a3e
Branches:  PHP-5.3 PHP-5.4 master

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

Log:
Partial fix for bug 61743 to get correct icacls path

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

Changed paths:
  M  ext/standard/tests/file/windows_acls/common.inc


Diff:
diff --git a/ext/standard/tests/file/windows_acls/common.inc 
b/ext/standard/tests/file/windows_acls/common.inc
index c9be2f1..4007ad0 100644
--- a/ext/standard/tests/file/windows_acls/common.inc
+++ b/ext/standard/tests/file/windows_acls/common.inc
@@ -25,16 +25,29 @@ function get_username(){
$user = get_current_user();
}
 
+   if (!$user) {
+   $user =  exec('echo %USERNAME%');
+   }
+
return $user;
 }
 
 function get_domainname()
 {
-   return getenv('USERDOMAIN');
+   $domain = getenv('USERDOMAIN');
+
+   return $domain;
+}
+
+function get_icacls()
+{
+   $sysroot = exec('echo %SYSTEMROOT%');
+
+   return $sysroot\\System32\\icacls.exe;
 }
 
 function icacls_set($path, $mode, $perm) {
-   $icacls = 'c:\\Windows\\System32\\icacls.exe';
+   $icacls = get_icacls();
$user = get_username();
$path_escaped =  '' . $path . '';
$perm_entry = array();


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