[PHP-CVS] svn: /SVNROOT/ httpd.conf

[Rasmus Lerdorf]

rasmus   Tue, 17 Dec 2013 22:36:38 +

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

Log:
Tweak

Changed paths:
U   SVNROOT/httpd.conf

Modified: SVNROOT/httpd.conf
===
--- SVNROOT/httpd.conf  2013-12-17 21:45:47 UTC (rev 332452)
+++ SVNROOT/httpd.conf  2013-12-17 22:36:38 UTC (rev 332453)
@@ -46,7 +46,7 @@
 /Location

 Alias /robots.txt /home/svn/robots.txt
-RedirectMatch ^/(?!robots|repository|viewvc|query|docroot)(.*)$ /viewvc/$1
+RedirectMatch ^/(?!robots|repository|viewvc|query|docroot|shared)(.*)$ 
/viewvc/$1

 /VirtualHost

@@ -102,5 +102,5 @@
 /Location

 Alias /robots.txt /home/svn/robots.txt
-RedirectMatch ^/(?!robots|repository|viewvc|query|docroot)(.*)$ /viewvc/$1
+RedirectMatch ^/(?!robots|repository|viewvc|query|docroot|shared)(.*)$ 
/viewvc/$1
 /VirtualHost

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

[PHP-CVS] com php-src: Fix English here: UPGRADING

[Rasmus Lerdorf]

Commit:e5e25c43f476456f5b342d4cd289d0ce5f8bbac4
Author:Rasmus Lerdorf ras...@lerdorf.com Sat, 2 Nov 2013 10:46:37 
-0700
Parents:   a0244a69ccc3777053002c68c68f3d896206ed2a
Branches:  master

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

Log:
Fix English here

Changed paths:
  M  UPGRADING


Diff:
diff --git a/UPGRADING b/UPGRADING
index 6e77f1d..ab05b3a 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -68,8 +68,8 @@ PHP X.Y UPGRADE NOTES
   CURLOPT_SAFE_UPLOAD is now turned on by default and uploads with @file 
   do not work unless it is explicitly set to false.
 
-- String:
-  crypt() is now raise E_NOTICE error if salt parameter is omitted.
+- Crypt:
+  crypt() will now raise an E_NOTICE error if the salt parameter is omitted.
   See: https://wiki.php.net/rfc/crypt_function_salt
 
 - XMLReader:


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

[PHP-CVS] com php-src: These getpwnam('') tests are silly and not portable: ext/posix/tests/posix_getgrnam.phpt ext/posix/tests/posix_getgrnam_basic.phpt ext/posix/tests/posix_getpwnam.phpt ext/posix/

[Rasmus Lerdorf]

Commit:2129de4569bec4acd89e5824a471f59d887c5b57
Author:Rasmus Lerdorf ras...@lerdorf.com Sun, 20 Oct 2013 
14:04:47 -0700
Parents:   288a4ec3bd4a9e93d9cadc045d6ca9472081a3ec
Branches:  PHP-5.5 master

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

Log:
These getpwnam('') tests are silly and not portable

Changed paths:
  D  ext/posix/tests/posix_getgrnam.phpt
  D  ext/posix/tests/posix_getgrnam_basic.phpt
  D  ext/posix/tests/posix_getpwnam.phpt
  D  ext/posix/tests/posix_getpwnam_basic.phpt


Diff:
diff --git a/ext/posix/tests/posix_getgrnam.phpt 
b/ext/posix/tests/posix_getgrnam.phpt
deleted file mode 100644
index 854db4a..000
--- a/ext/posix/tests/posix_getgrnam.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-posix_getgrnam(): Basic tests
---SKIPIF--
-?php
-if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
-if (!function_exists('posix_getgrnam')) die('skip posix_getgrnam() not found');
-?
---FILE--
-?php
-
-var_dump(posix_getgrnam(NULL));
-var_dump(posix_getgrnam(1));
-var_dump(posix_getgrnam(''));
-
-?
---EXPECT--
-bool(false)
-bool(false)
-bool(false)
diff --git a/ext/posix/tests/posix_getgrnam_basic.phpt 
b/ext/posix/tests/posix_getgrnam_basic.phpt
deleted file mode 100644
index fd5bf23..000
--- a/ext/posix/tests/posix_getgrnam_basic.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-posix_getgrnam(): Basic tests
---SKIPIF--
-?php
-if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
-if (!function_exists('posix_getgrnam')) die('skip posix_getgrnam() not found');
-?
---FILE--
-?php
-echo Basic test of POSIX posix_getgrnam function\n;  
-
-var_dump(posix_getgrnam(NULL));
-var_dump(posix_getgrnam(1));
-var_dump(posix_getgrnam(''));
-
-?
-===DONE===
---EXPECT--
-Basic test of POSIX posix_getgrnam function
-bool(false)
-bool(false)
-bool(false)
-===DONE===
\ No newline at end of file
diff --git a/ext/posix/tests/posix_getpwnam.phpt 
b/ext/posix/tests/posix_getpwnam.phpt
deleted file mode 100644
index b5de1e4..000
--- a/ext/posix/tests/posix_getpwnam.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-posix_getpwnam(): Basic tests
---SKIPIF--
-?php
-if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
-if (!function_exists('posix_getpwnam')) die('skip posix_getpwnam() not found');
-?
---FILE--
-?php
-
-var_dump(posix_getpwnam(1));
-var_dump(posix_getpwnam(''));
-var_dump(posix_getpwnam(NULL));
-
-?
---EXPECT--
-bool(false)
-bool(false)
-bool(false)
diff --git a/ext/posix/tests/posix_getpwnam_basic.phpt 
b/ext/posix/tests/posix_getpwnam_basic.phpt
deleted file mode 100644
index d675d6c..000
--- a/ext/posix/tests/posix_getpwnam_basic.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-posix_getpwnam(): Basic tests
---SKIPIF--
-?php
-if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
-if (!function_exists('posix_getpwnam')) die('skip posix_getpwnam() not found');
-?
---FILE--
-?php
-echo Basic test of POSIX posix_getpwnam function\n; 
-
-var_dump(posix_getpwnam(1));
-var_dump(posix_getpwnam(''));
-var_dump(posix_getpwnam(NULL));
-
-?
-===DONE
---EXPECT--
-Basic test of POSIX posix_getpwnam function
-bool(false)
-bool(false)
-bool(false)
-===DONE


--
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: sapi/fpm/fpm/fastcgi.c

[Rasmus Lerdorf]

Commit:9e4651f6f181e0d90daab2a97fb57a76fe105a29
Author:Rasmus Lerdorf ras...@lerdorf.com Sun, 20 Oct 2013 
17:56:14 -0700
Parents:   2129de4569bec4acd89e5824a471f59d887c5b57 
18cc5386de399f4410d8e5bf0a7aa5a06b0309be
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  Fix typo

Changed paths:
  MM  sapi/fpm/fpm/fastcgi.c


Diff:



--
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: ext/ftp/ftp.c

[Rasmus Lerdorf]

Commit:c5e5a6c2ac68b0007f3bfabd79cebe8163084b9f
Author:Rasmus Lerdorf ras...@lerdorf.com Sun, 20 Oct 2013 
08:56:24 -0700
Parents:   8aa19c9fd8bcccd76d5246064fd4eab4e4b5c4f2 
1494298231072d5991e76db5ef25f20e81018106
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  Minor Coverity tweaks

Changed paths:
  MM  ext/ftp/ftp.c


Diff:



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

[PHP-CVS] com php-src: Minor Coverity tweaks: ext/ftp/ftp.c

[Rasmus Lerdorf]

Commit:1494298231072d5991e76db5ef25f20e81018106
Author:Rasmus Lerdorf ras...@lerdorf.com Sun, 20 Oct 2013 
08:55:48 -0700
Parents:   9976b5cd7f36d90b49d1dcf58ec6497f0e592b7d
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
Minor Coverity tweaks

Changed paths:
  M  ext/ftp/ftp.c


Diff:
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 58d3c2e..4da8d60 100644
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -1643,7 +1643,7 @@ ftp_genlist(ftpbuf_t *ftp, const char *cmd, const char 
*path TSRMLS_DC)
if (ftp-resp == 226) {
ftp-data = data_close(ftp, data);
php_stream_close(tmpstream);
-   return ecalloc(1, sizeof(char**));
+   return ecalloc(1, sizeof(char*));
}
 
/* pull data buffer into tmpfile */
@@ -1671,11 +1671,11 @@ ftp_genlist(ftpbuf_t *ftp, const char *cmd, const char 
*path TSRMLS_DC)
}
}
 
-   ftp-data = data = data_close(ftp, data);
+   ftp-data = data_close(ftp, data);
 
php_stream_rewind(tmpstream);
 
-   ret = safe_emalloc((lines + 1), sizeof(char**), size * sizeof(char*));
+   ret = safe_emalloc((lines + 1), sizeof(char*), size * sizeof(char*));
 
entry = ret;
text = (char*) (ret + lines + 1);


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

[PHP-CVS] com php-src: Clean up this weird safe_emalloc() call: ext/ftp/ftp.c

[Rasmus Lerdorf]

Commit:8f4a6d6e1b6c36259a5dc865d16f0dad76f2f2c9
Author:Rasmus Lerdorf ras...@lerdorf.com Sun, 20 Oct 2013 
09:36:50 -0700
Parents:   1494298231072d5991e76db5ef25f20e81018106
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
Clean up this weird safe_emalloc() call

Changed paths:
  M  ext/ftp/ftp.c


Diff:
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 4da8d60..b82017e 100644
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -1675,7 +1675,7 @@ ftp_genlist(ftpbuf_t *ftp, const char *cmd, const char 
*path TSRMLS_DC)
 
php_stream_rewind(tmpstream);
 
-   ret = safe_emalloc((lines + 1), sizeof(char*), size * sizeof(char*));
+   ret = safe_emalloc((lines + 1), sizeof(char*), size);
 
entry = ret;
text = (char*) (ret + lines + 1);


--
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: ext/ftp/ftp.c

[Rasmus Lerdorf]

Commit:288a4ec3bd4a9e93d9cadc045d6ca9472081a3ec
Author:Rasmus Lerdorf ras...@lerdorf.com Sun, 20 Oct 2013 
09:37:25 -0700
Parents:   c5e5a6c2ac68b0007f3bfabd79cebe8163084b9f 
8f4a6d6e1b6c36259a5dc865d16f0dad76f2f2c9
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  Clean up this weird safe_emalloc() call

Changed paths:
  MM  ext/ftp/ftp.c


Diff:



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

[PHP-CVS] com php-src: This doesn't fail in 5.5 anymore: ext/pdo_mysql/tests/bug_44454.phpt

[Rasmus Lerdorf]

Commit:626d96ab6dc844071b0c86bb382e89713b33df14
Author:Rasmus Lerdorf ras...@php.net Sat, 3 Aug 2013 12:14:47 
-0400
Parents:   f17f596b27815f097d8831eed57d62eb06d0bd3c
Branches:  PHP-5.5 master

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

Log:
This doesn't fail in 5.5 anymore

Changed paths:
  M  ext/pdo_mysql/tests/bug_44454.phpt


Diff:
diff --git a/ext/pdo_mysql/tests/bug_44454.phpt 
b/ext/pdo_mysql/tests/bug_44454.phpt
index 89a4e2a..eb93d97 100644
--- a/ext/pdo_mysql/tests/bug_44454.phpt
+++ b/ext/pdo_mysql/tests/bug_44454.phpt
@@ -73,8 +73,6 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc';
 $db = MySQLPDOTest::factory();
 $db-exec('DROP TABLE IF EXISTS test');
 ?
---XFAIL--
-For some reason the exception gets thrown at the wrong place
 --EXPECTF--
 Native Prepared Statements
 ... SELECT has returned 1 row...


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

[PHP-CVS] com php-src: Make sure test.php isn't coming in from the include_path: Zend/tests/bug60771.phpt

[Rasmus Lerdorf]

Commit:5753b74fabb641474d0b4879055180dd9d492b34
Author:Rasmus Lerdorf ras...@php.net Fri, 2 Aug 2013 11:47:12 
-0400
Parents:   ce9169e360701ea3b1ab2366171c24d4de5e78e3
Branches:  master

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

Log:
Make sure test.php isn't coming in from the include_path

Changed paths:
  M  Zend/tests/bug60771.phpt

diff --git a/Zend/tests/bug60771.phpt b/Zend/tests/bug60771.phpt
index c20bbc4..119ae50 100644
--- a/Zend/tests/bug60771.phpt
+++ b/Zend/tests/bug60771.phpt
@@ -1,10 +1,10 @@
---TEST--
-test of larger than 8kb text file being parsed by require statement
---FILE--
-?php
- file_put_contents('test.php',str_repeat('passed, ',1024));
- require('test.php');
- unlink('test.php');
-?
---EXPECT--
-passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
passed, passed, passed, passed, passed, passed, passed, passed

[PHP-CVS] com php-src: This test will only work if gc is enabled: ext/spl/tests/bug63680.phpt

[Rasmus Lerdorf]

Commit:e55f08a5aedf7f0153a969dbca870d7213c49a0f
Author:Rasmus Lerdorf ras...@php.net Fri, 2 Aug 2013 12:00:48 
-0400
Parents:   5753b74fabb641474d0b4879055180dd9d492b34
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
This test will only work if gc is enabled

Changed paths:
  M  ext/spl/tests/bug63680.phpt


Diff:
diff --git a/ext/spl/tests/bug63680.phpt b/ext/spl/tests/bug63680.phpt
index 3a20c4b..0b5c35d 100644
--- a/ext/spl/tests/bug63680.phpt
+++ b/ext/spl/tests/bug63680.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #63680 (Memleak in splfixedarray with cycle reference)
+--INI--
+zend.enable_gc=1
 --FILE--
 ?php
 function dummy() {


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

[PHP-CVS] com php-src: This test needs local infile enabled: ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt

[Rasmus Lerdorf]

Commit:ea75b1b5dbb34a8c07f53487e08a3521fc491a84
Author:Rasmus Lerdorf ras...@php.net Fri, 2 Aug 2013 15:33:18 
-0400
Parents:   e55f08a5aedf7f0153a969dbca870d7213c49a0f
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
This test needs local infile enabled

Changed paths:
  M  ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt


Diff:
diff --git a/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt 
b/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
index b550cb8..ebf22ef 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
@@ -48,6 +48,7 @@ if (($tmp[1] !== 'localhost')  ($tmp[1] !== '127.0.0.1'))
}
 
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 
'mysql_pdo_test.inc');
+   putenv('PDOTEST_ATTR='.serialize([PDO::MYSQL_ATTR_LOCAL_INFILE=true]));
$db = MySQLPDOTest::factory();
MySQLPDOTest::createTestTable($db, 
MySQLPDOTest::detect_transactional_mysql_engine($db));


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

[PHP-CVS] com php-src: pcre_quote? No such thing. How did this ever pass?: ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt

[Rasmus Lerdorf]

Commit:d60e168a7a73b1bd311754943856c1598d1cd9dc
Author:Rasmus Lerdorf ras...@php.net Fri, 2 Aug 2013 16:12:21 
-0400
Parents:   ea75b1b5dbb34a8c07f53487e08a3521fc491a84
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
pcre_quote? No such thing. How did this ever pass?

Changed paths:
  M  ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt


Diff:
diff --git a/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt 
b/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt
index 9674e85..74b4a73 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt
@@ -18,7 +18,7 @@ $db = MySQLPDOTest::factory();
ob_end_clean();
 
/*  PDO Driver for MySQL, client library version = 6.0.3-alpha 
*/
-   $reg = 'Client API version.*' . 
pcre_quote($db-getAttribute(PDO::ATTR_CLIENT_VERSION), '/');
+   $reg = 'Client API version.*' . 
preg_quote($db-getAttribute(PDO::ATTR_CLIENT_VERSION), '/');
 
if (!preg_match(/$reg/, $tmp)) {
printf([001] Cannot find MySQL PDO driver line in phpinfo() 
output\n);


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

[PHP-CVS] com php-src: We shouldn't load any local ini files for these tests: ext/pcntl/tests/pcntl_exec.phpt ext/pcntl/tests/pcntl_exec_2.phpt

[Rasmus Lerdorf]

Commit:a03f0943ca0384b37083d371b121f23ad2054a83
Author:Rasmus Lerdorf ras...@php.net Fri, 2 Aug 2013 16:23:18 
-0400
Parents:   d60e168a7a73b1bd311754943856c1598d1cd9dc
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
We shouldn't load any local ini files for these tests

Changed paths:
  M  ext/pcntl/tests/pcntl_exec.phpt
  M  ext/pcntl/tests/pcntl_exec_2.phpt


Diff:
diff --git a/ext/pcntl/tests/pcntl_exec.phpt b/ext/pcntl/tests/pcntl_exec.phpt
index 9d2ec1d..9a2c96e 100644
--- a/ext/pcntl/tests/pcntl_exec.phpt
+++ b/ext/pcntl/tests/pcntl_exec.phpt
@@ -8,7 +8,7 @@ if (!getenv(TEST_PHP_EXECUTABLE) || 
!is_executable(getenv(TEST_PHP_EXECUTABLE
 --FILE--
 ?php
 echo ok\n;
-pcntl_exec(getenv(TEST_PHP_EXECUTABLE));
+pcntl_exec(getenv(TEST_PHP_EXECUTABLE), ['-n']);
 echo nok\n;
 ?
 --EXPECT--
diff --git a/ext/pcntl/tests/pcntl_exec_2.phpt 
b/ext/pcntl/tests/pcntl_exec_2.phpt
index 02b5e22..e18527d 100644
--- a/ext/pcntl/tests/pcntl_exec_2.phpt
+++ b/ext/pcntl/tests/pcntl_exec_2.phpt
@@ -14,7 +14,7 @@ if (getenv(PCNTL_EXEC_TEST_IS_CHILD)) {
exit;
 }
 echo ok\n;
-pcntl_exec(getenv(TEST_PHP_EXECUTABLE), array(__FILE__), array(
+pcntl_exec(getenv(TEST_PHP_EXECUTABLE), array('-n', __FILE__), array(
bPCNTL_EXEC_TEST_IS_CHILD = b1, 
bFOO = bBAR,
1 = blong)


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

[PHP-CVS] com php-src: This needs to be a long Otherwise we are limited to a 32G opcache segment: ext/opcache/zend_shared_alloc.c ext/opcache/zend_shared_alloc.h

[Rasmus Lerdorf]

Commit:29ee4b81f2a17943b677d9b6fb372ec36166984a
Author:Rasmus Lerdorf ras...@php.net Wed, 29 May 2013 14:17:32 
-0700
Parents:   7e00d0994f666f9ed698f86bcd88087ebabe2bfe
Branches:  PHP-5.5

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

Log:
This needs to be a long
Otherwise we are limited to a 32G opcache segment

Changed paths:
  M  ext/opcache/zend_shared_alloc.c
  M  ext/opcache/zend_shared_alloc.h


Diff:
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
index 5405751..691c2a5 100644
--- a/ext/opcache/zend_shared_alloc.c
+++ b/ext/opcache/zend_shared_alloc.c
@@ -119,7 +119,7 @@ static void copy_shared_segments(void *to, void *from, int 
count, int size)
}
 }
 
-static int zend_shared_alloc_try(const zend_shared_memory_handler_entry *he, 
int requested_size, zend_shared_segment ***shared_segments_p, int 
*shared_segments_count, char **error_in)
+static int zend_shared_alloc_try(const zend_shared_memory_handler_entry *he, 
long requested_size, zend_shared_segment ***shared_segments_p, int 
*shared_segments_count, char **error_in)
 {
int res;
g_shared_alloc_handler = he-handler;
@@ -148,7 +148,7 @@ static int zend_shared_alloc_try(const 
zend_shared_memory_handler_entry *he, int
return ALLOC_FAILURE;
 }
 
-int zend_shared_alloc_startup(int requested_size)
+int zend_shared_alloc_startup(long requested_size)
 {
zend_shared_segment **tmp_shared_segments;
size_t shared_segments_array_size;
diff --git a/ext/opcache/zend_shared_alloc.h b/ext/opcache/zend_shared_alloc.h
index b7f3629..40f1f89 100644
--- a/ext/opcache/zend_shared_alloc.h
+++ b/ext/opcache/zend_shared_alloc.h
@@ -117,7 +117,7 @@ extern zend_smm_shared_globals *smm_shared_globals;
 
 #define SHARED_ALLOC_REATTACHED(SUCCESS+1)
 
-int zend_shared_alloc_startup(int requested_size);
+int zend_shared_alloc_startup(long requested_size);
 void zend_shared_alloc_shutdown(void);
 
 /* allocate shared memory block */


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

Re: [PHP-CVS] com php-src: This needs to be a long Otherwise we are limited to a 32G opcache segment: ext/opcache/zend_shared_alloc.c ext/opcache/zend_shared_alloc.h

[Rasmus Lerdorf]

On 05/29/2013 02:22 PM, Rasmus Lerdorf wrote:
 Commit:29ee4b81f2a17943b677d9b6fb372ec36166984a
 Author:Rasmus Lerdorf ras...@php.net Wed, 29 May 2013 14:17:32 
 -0700
 Parents:   7e00d0994f666f9ed698f86bcd88087ebabe2bfe
 Branches:  PHP-5.5
 
 Link:   
 http://git.php.net/?p=php-src.git;a=commitdiff;h=29ee4b81f2a17943b677d9b6fb372ec36166984a
 
 Log:
 This needs to be a long
 Otherwise we are limited to a 32G opcache segment

Gah! I meant a 2G opcache segment there


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

[PHP-CVS] com php-src: This needs to be a long Otherwise we are limited to a 2G opcache segment: ext/opcache/zend_shared_alloc.c ext/opcache/zend_shared_alloc.h

[Rasmus Lerdorf]

Commit:80c13e99653ce2638700b6b0c32f8cf732213d75
Author:Rasmus Lerdorf ras...@php.net Wed, 29 May 2013 14:17:32 
-0700
Parents:   029c1da84647d55ddc9fb09722e1fd0cdf427ac5
Branches:  master

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

Log:
This needs to be a long
Otherwise we are limited to a 2G opcache segment

Changed paths:
  M  ext/opcache/zend_shared_alloc.c
  M  ext/opcache/zend_shared_alloc.h


Diff:
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
index 5405751..691c2a5 100644
--- a/ext/opcache/zend_shared_alloc.c
+++ b/ext/opcache/zend_shared_alloc.c
@@ -119,7 +119,7 @@ static void copy_shared_segments(void *to, void *from, int 
count, int size)
}
 }
 
-static int zend_shared_alloc_try(const zend_shared_memory_handler_entry *he, 
int requested_size, zend_shared_segment ***shared_segments_p, int 
*shared_segments_count, char **error_in)
+static int zend_shared_alloc_try(const zend_shared_memory_handler_entry *he, 
long requested_size, zend_shared_segment ***shared_segments_p, int 
*shared_segments_count, char **error_in)
 {
int res;
g_shared_alloc_handler = he-handler;
@@ -148,7 +148,7 @@ static int zend_shared_alloc_try(const 
zend_shared_memory_handler_entry *he, int
return ALLOC_FAILURE;
 }
 
-int zend_shared_alloc_startup(int requested_size)
+int zend_shared_alloc_startup(long requested_size)
 {
zend_shared_segment **tmp_shared_segments;
size_t shared_segments_array_size;
diff --git a/ext/opcache/zend_shared_alloc.h b/ext/opcache/zend_shared_alloc.h
index b7f3629..40f1f89 100644
--- a/ext/opcache/zend_shared_alloc.h
+++ b/ext/opcache/zend_shared_alloc.h
@@ -117,7 +117,7 @@ extern zend_smm_shared_globals *smm_shared_globals;
 
 #define SHARED_ALLOC_REATTACHED(SUCCESS+1)
 
-int zend_shared_alloc_startup(int requested_size);
+int zend_shared_alloc_startup(long requested_size);
 void zend_shared_alloc_shutdown(void);
 
 /* allocate shared memory block */


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

[PHP-CVS] com php-src: Use size_t everywhere instead: ext/opcache/shared_alloc_shm.c ext/opcache/zend_shared_alloc.c ext/opcache/zend_shared_alloc.h

[Rasmus Lerdorf]

Commit:4c762152bf138d7f090699584ded3ceb519910bf
Author:Rasmus Lerdorf ras...@php.net Wed, 29 May 2013 14:34:22 
-0700
Parents:   29ee4b81f2a17943b677d9b6fb372ec36166984a
Branches:  PHP-5.5

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

Log:
Use size_t everywhere instead

Changed paths:
  M  ext/opcache/shared_alloc_shm.c
  M  ext/opcache/zend_shared_alloc.c
  M  ext/opcache/zend_shared_alloc.h


Diff:
diff --git a/ext/opcache/shared_alloc_shm.c b/ext/opcache/shared_alloc_shm.c
index d53236b..a88cc2e 100644
--- a/ext/opcache/shared_alloc_shm.c
+++ b/ext/opcache/shared_alloc_shm.c
@@ -54,7 +54,7 @@ typedef struct  {
 static int create_segments(size_t requested_size, zend_shared_segment_shm 
***shared_segments_p, int *shared_segments_count, char **error_in)
 {
int i;
-   unsigned int allocate_size = 0, remaining_bytes = requested_size, 
seg_allocate_size;
+   size_t allocate_size = 0, remaining_bytes = requested_size, 
seg_allocate_size;
int first_segment_id = -1;
key_t first_segment_key = -1;
struct shmid_ds sds;
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
index 691c2a5..d752afe 100644
--- a/ext/opcache/zend_shared_alloc.c
+++ b/ext/opcache/zend_shared_alloc.c
@@ -119,7 +119,7 @@ static void copy_shared_segments(void *to, void *from, int 
count, int size)
}
 }
 
-static int zend_shared_alloc_try(const zend_shared_memory_handler_entry *he, 
long requested_size, zend_shared_segment ***shared_segments_p, int 
*shared_segments_count, char **error_in)
+static int zend_shared_alloc_try(const zend_shared_memory_handler_entry *he, 
size_t requested_size, zend_shared_segment ***shared_segments_p, int 
*shared_segments_count, char **error_in)
 {
int res;
g_shared_alloc_handler = he-handler;
@@ -148,7 +148,7 @@ static int zend_shared_alloc_try(const 
zend_shared_memory_handler_entry *he, lon
return ALLOC_FAILURE;
 }
 
-int zend_shared_alloc_startup(long requested_size)
+int zend_shared_alloc_startup(size_t requested_size)
 {
zend_shared_segment **tmp_shared_segments;
size_t shared_segments_array_size;
diff --git a/ext/opcache/zend_shared_alloc.h b/ext/opcache/zend_shared_alloc.h
index 40f1f89..e94ecab 100644
--- a/ext/opcache/zend_shared_alloc.h
+++ b/ext/opcache/zend_shared_alloc.h
@@ -117,7 +117,7 @@ extern zend_smm_shared_globals *smm_shared_globals;
 
 #define SHARED_ALLOC_REATTACHED(SUCCESS+1)
 
-int zend_shared_alloc_startup(long requested_size);
+int zend_shared_alloc_startup(size_t requested_size);
 void zend_shared_alloc_shutdown(void);
 
 /* allocate shared memory block */


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

[PHP-CVS] com php-src: Use size_t everywhere instead: ext/opcache/shared_alloc_shm.c ext/opcache/zend_shared_alloc.c ext/opcache/zend_shared_alloc.h

[Rasmus Lerdorf]

Commit:e02add77fccbff3930d2abe1734ce34c9e562782
Author:Rasmus Lerdorf ras...@php.net Wed, 29 May 2013 14:34:22 
-0700
Parents:   80c13e99653ce2638700b6b0c32f8cf732213d75
Branches:  master

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

Log:
Use size_t everywhere instead

Changed paths:
  M  ext/opcache/shared_alloc_shm.c
  M  ext/opcache/zend_shared_alloc.c
  M  ext/opcache/zend_shared_alloc.h


Diff:
diff --git a/ext/opcache/shared_alloc_shm.c b/ext/opcache/shared_alloc_shm.c
index d53236b..a88cc2e 100644
--- a/ext/opcache/shared_alloc_shm.c
+++ b/ext/opcache/shared_alloc_shm.c
@@ -54,7 +54,7 @@ typedef struct  {
 static int create_segments(size_t requested_size, zend_shared_segment_shm 
***shared_segments_p, int *shared_segments_count, char **error_in)
 {
int i;
-   unsigned int allocate_size = 0, remaining_bytes = requested_size, 
seg_allocate_size;
+   size_t allocate_size = 0, remaining_bytes = requested_size, 
seg_allocate_size;
int first_segment_id = -1;
key_t first_segment_key = -1;
struct shmid_ds sds;
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
index 691c2a5..d752afe 100644
--- a/ext/opcache/zend_shared_alloc.c
+++ b/ext/opcache/zend_shared_alloc.c
@@ -119,7 +119,7 @@ static void copy_shared_segments(void *to, void *from, int 
count, int size)
}
 }
 
-static int zend_shared_alloc_try(const zend_shared_memory_handler_entry *he, 
long requested_size, zend_shared_segment ***shared_segments_p, int 
*shared_segments_count, char **error_in)
+static int zend_shared_alloc_try(const zend_shared_memory_handler_entry *he, 
size_t requested_size, zend_shared_segment ***shared_segments_p, int 
*shared_segments_count, char **error_in)
 {
int res;
g_shared_alloc_handler = he-handler;
@@ -148,7 +148,7 @@ static int zend_shared_alloc_try(const 
zend_shared_memory_handler_entry *he, lon
return ALLOC_FAILURE;
 }
 
-int zend_shared_alloc_startup(long requested_size)
+int zend_shared_alloc_startup(size_t requested_size)
 {
zend_shared_segment **tmp_shared_segments;
size_t shared_segments_array_size;
diff --git a/ext/opcache/zend_shared_alloc.h b/ext/opcache/zend_shared_alloc.h
index 40f1f89..e94ecab 100644
--- a/ext/opcache/zend_shared_alloc.h
+++ b/ext/opcache/zend_shared_alloc.h
@@ -117,7 +117,7 @@ extern zend_smm_shared_globals *smm_shared_globals;
 
 #define SHARED_ALLOC_REATTACHED(SUCCESS+1)
 
-int zend_shared_alloc_startup(long requested_size);
+int zend_shared_alloc_startup(size_t requested_size);
 void zend_shared_alloc_shutdown(void);
 
 /* allocate shared memory block */


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

[PHP-CVS] com php-src: Fixed bugs #47675 and #64577 (fd leak on Solaris): NEWS main/main.c

[Rasmus Lerdorf]

Commit:569eddce0f8ff0f0b61c4760ca45d3b871b5156d
Author:Rasmus Lerdorf ras...@php.net Thu, 4 Apr 2013 19:22:28 
-0700
Parents:   185e5e15ae5e6d69f667dcc51205db23e0db8eb0
Branches:  PHP-5.4

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

Log:
Fixed bugs #47675 and #64577 (fd leak on Solaris)

Bugs:
https://bugs.php.net/47675
https://bugs.php.net/64577

Changed paths:
  M  NEWS
  M  main/main.c


Diff:
diff --git a/NEWS b/NEWS
index c39ef92..a107dd6 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ PHP 
   NEWS
 segfault). (Laruence)
   . Fixed bug #64433 (follow_location parameter of context is ignored for most 
 response codes). (Sergey Akbarov)
+  . Fixed bugs #47675 and #64577 (fd leak on Solaris)
 
 - CURL:
   . Add CURL_WRAPPERS_ENABLE constant. (Laruence)
diff --git a/main/main.c b/main/main.c
index be289c8..7a253f8 100644
--- a/main/main.c
+++ b/main/main.c
@@ -2406,8 +2406,8 @@ PHPAPI int php_execute_script(zend_file_handle 
*primary_file TSRMLS_DC)
 {
zend_file_handle *prepend_file_p, *append_file_p;
zend_file_handle prepend_file = {0}, append_file = {0};
-#if HAVE_BROKEN_GETCWD
-   int old_cwd_fd = -1;
+#if HAVE_BROKEN_GETCWD 
+   volatile int old_cwd_fd = -1;
 #else
char *old_cwd;
ALLOCA_FLAG(use_heap)


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

[PHP-CVS] com php-src: Fixed bugs #47675 and #64577 (fd leak on Solaris): NEWS main/main.c

[Rasmus Lerdorf]

Commit:1b60c189ad4e45d57df576ab180c5cb91c2db8a7
Author:Rasmus Lerdorf ras...@php.net Thu, 4 Apr 2013 19:15:52 
-0700
Parents:   934dfae4e1db7a31f29de3e94cbb8bb9b6c1aa3f
Branches:  PHP-5.3

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

Log:
Fixed bugs #47675 and #64577 (fd leak on Solaris)

Bugs:
https://bugs.php.net/47675
https://bugs.php.net/64577

Changed paths:
  M  NEWS
  M  main/main.c


Diff:
diff --git a/NEWS b/NEWS
index 1c52241..d876c36 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ PHP 
   NEWS
 - Core:
   . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: 
 segfault). (Laruence)
-
+  . Fixed bugs #47675 and #64577 (fd leak on Solaris)
 
 ?? ??? 2013, PHP 5.3.24
 
diff --git a/main/main.c b/main/main.c
index 654cbf8..4e0294c 100644
--- a/main/main.c
+++ b/main/main.c
@@ -2231,7 +2231,7 @@ PHPAPI int php_execute_script(zend_file_handle 
*primary_file TSRMLS_DC)
zend_file_handle *prepend_file_p, *append_file_p;
zend_file_handle prepend_file = {0}, append_file = {0};
 #if HAVE_BROKEN_GETCWD 
-   int old_cwd_fd = -1;
+   volatile int old_cwd_fd = -1;
 #else
char *old_cwd;
ALLOCA_FLAG(use_heap)


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

[PHP-CVS] com php-src: Fixed bugs #47675 and #64577 (fd leak on Solaris): main/main.c

[Rasmus Lerdorf]

Commit:cb54fada51adfa9d19ee21740efe09bf3b2befe1
Author:Rasmus Lerdorf ras...@php.net Thu, 4 Apr 2013 19:24:12 
-0700
Parents:   e9cc55a803ef7db15ab0feb1029f5d7cb8b67c6a
Branches:  master

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

Log:
Fixed bugs #47675 and #64577 (fd leak on Solaris)

Bugs:
https://bugs.php.net/47675
https://bugs.php.net/64577

Changed paths:
  M  main/main.c


Diff:
diff --git a/main/main.c b/main/main.c
index a792fb6..40304c7 100644
--- a/main/main.c
+++ b/main/main.c
@@ -2397,8 +2397,8 @@ PHPAPI int php_execute_script(zend_file_handle 
*primary_file TSRMLS_DC)
 {
zend_file_handle *prepend_file_p, *append_file_p;
zend_file_handle prepend_file = {0}, append_file = {0};
-#if HAVE_BROKEN_GETCWD
-   int old_cwd_fd = -1;
+#if HAVE_BROKEN_GETCWD 
+   volatile int old_cwd_fd = -1;
 #else
char *old_cwd;
ALLOCA_FLAG(use_heap)


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

[PHP-CVS] com php-src: Fixed bugs #47675 and #64577 (fd leak on Solaris): NEWS main/main.c

[Rasmus Lerdorf]

Commit:c3a57fff5e4b5a964fef8b30506ff252d9cf146a
Author:Rasmus Lerdorf ras...@php.net Thu, 4 Apr 2013 19:23:22 
-0700
Parents:   9587cf385e9c0220cbd999a13ed73ce5e496515b
Branches:  PHP-5.5

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

Log:
Fixed bugs #47675 and #64577 (fd leak on Solaris)

Bugs:
https://bugs.php.net/47675
https://bugs.php.net/64577

Changed paths:
  M  NEWS
  M  main/main.c


Diff:
diff --git a/NEWS b/NEWS
index ce3f78a..179db2f 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ PHP 
   NEWS
   . Fixed bug #64565 (copy doesn't report failure on partial copy). (Remi)
   . Fixed bug #64555 (foreach no longer copies keys if they are interned).
 (Nikita Popov)
+  . Fixed bugs #47675 and #64577 (fd leak on Solaris)
 
 - CURL:
   . Added CURL_WRAPPERS_ENABLE constant. (Laruence)
diff --git a/main/main.c b/main/main.c
index 325ef7e..355afbc 100644
--- a/main/main.c
+++ b/main/main.c
@@ -2397,8 +2397,8 @@ PHPAPI int php_execute_script(zend_file_handle 
*primary_file TSRMLS_DC)
 {
zend_file_handle *prepend_file_p, *append_file_p;
zend_file_handle prepend_file = {0}, append_file = {0};
-#if HAVE_BROKEN_GETCWD
-   int old_cwd_fd = -1;
+#if HAVE_BROKEN_GETCWD 
+   volatile int old_cwd_fd = -1;
 #else
char *old_cwd;
ALLOCA_FLAG(use_heap)


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

[PHP-CVS] com php-src: The printf modifier for a double is just %f: .gdbinit

[Rasmus Lerdorf]

Commit:527ac404a124a574321bdcc209fd4f30d05d7144
Author:Rasmus Lerdorf ras...@php.net Mon, 1 Apr 2013 16:27:09 
-0700
Parents:   7b07d05917d9ff40a70bd6ecffca840e2458ea86
Branches:  master

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

Log:
The printf modifier for a double is just %f

Changed paths:
  M  .gdbinit


Diff:
diff --git a/.gdbinit b/.gdbinit
index e7a565d..b14b03d 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -106,7 +106,7 @@ define dump_bt
printf %ld, 
$zvalue-value.lval
end
if $type == 2
-   printf %lf, 
$zvalue-value.dval
+   printf %f, $zvalue-value.dval
end
if $type == 3
if $zvalue-value.lval
@@ -185,7 +185,7 @@ define printzv_contents
printf long: %ld, $zvalue-value.lval
end
if $type == 2
-   printf double: %lf, $zvalue-value.dval
+   printf double: %f, $zvalue-value.dval
end
if $type == 3
printf bool: 


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

[PHP-CVS] com php-src: Tweaks an add OPcache info to UPGRADING: UPGRADING

[Rasmus Lerdorf]

Commit:fd2b8df26562331fe1eccdc10efb3d8f98379a68
Author:Rasmus Lerdorf ras...@php.net Thu, 21 Mar 2013 23:14:16 
-0700
Parents:   293d5defb4eb3962ac6b1ed6620ebc38836e5581
Branches:  PHP-5.5

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

Log:
Tweaks an add OPcache info to UPGRADING

Changed paths:
  M  UPGRADING


Diff:
diff --git a/UPGRADING b/UPGRADING
index 126bc26..cc3aebb 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -29,7 +29,6 @@ PHP 5.5 UPGRADE NOTES
 - php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid() and 
   zend_logo_guid() have been removed
 - Removal of Logo GUIDs
-
 - extensions can't override zend_execute() any more, they should override
   zend_execute_ex() instead. The EG(current_execute_data) is already
   initialized in zend_execute_ex(), so for compatibility extensions
@@ -79,15 +78,17 @@ PHP 5.5 UPGRADE NOTES
   (https://wiki.php.net/rfc/generators)
 - ClassName::class syntax returning full class name for a class as 
   a string constant. (https://wiki.php.net/rfc/class_name_scalars)
-- Support for changing the process's title in CLI/CLI-Server SAPIs. (Keyur)
-  (https://wiki.php.net/rfc/cli_process_title)
 - Added support for non-scalar Iterator keys in foreach.
   (https://wiki.php.net/rfc/foreach-non-scalar-keys).
+- Bundled Zend OPcache extension
+ (https://wiki.php.net/rfc/optimizerplus)
 
 
 2. Changes in SAPI modules
 
 
+- Support for changing the process's title in CLI/CLI-Server SAPIs. (Keyur)
+  (https://wiki.php.net/rfc/cli_process_title)
 
 
 3. Deprecated Functionality
@@ -277,6 +278,11 @@ PHP 5.5 UPGRADE NOTES
 - SPL:
   - SplFixedArray::__wakeup()
 
+- Zend OPcache
+ - opcache_get_configuration()
+ - opcache_get_status()
+ - opcache_reset()
+
 
 6. New Classes and Interfaces
 
@@ -333,7 +339,7 @@ PHP 5.5 UPGRADE NOTES
 
 
 - Core:
-  - Added sys_temp_dir INI directive, for specifying temp firectory.
+  - Added sys_temp_dir INI directive, for specifying temp directory.
 
 - Intl:
   - Added intl.use_exceptions INI directive, which controls what happens when
@@ -344,6 +350,33 @@ PHP 5.5 UPGRADE NOTES
 APIs which use(are built) for mysqlnd. This allows ext/mysqli to be used
with the new auth protocol, although at coarser level.
 
+- Zend OPcache (See ext/opcache/README for more details)
+  - Added the following directives:
+- opcache.enable (default 1)
+- opcache.memory_consumption (default 64)
+- opcache.interned_strings_buffer (default 4)
+- opcache.max_accelerated_files (default 2000)
+- opcache.max_wasted_percentage (default 5)
+- opcache.use_cwd (default 1)
+- opcache.validate_timestamps (default 1)
+- opcache.revalidate_freq (default 2)
+- opcache.revalidate_path (default 0)
+- opcache.save_comments (default 1)
+- opcache.load_comments (default 1)
+- opcache.fast_shutdown (default 0)
+- opcache.enable_file_override (default 0)
+- opcache.optimization_level (default 0x)
+- opcache.inherited_hack (default 1)
+- opcache.blacklist_filename (default )
+- opcache.max_file_size (default 0)
+- opcache.consistency_checks (default 0)
+- opcache.force_restart_timeout (default 180)
+- opcache.error_log (default  which means stderr)
+- opcache.log_verbosity_level (default 1)
+- opcache.preferred_memory_model (default )
+- opcache.protect_memory (default 0)
+- opcache.mmap_base (Windows-only)
+
 
 11. Windows Support
 


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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Wed, 27 Feb 2013 21:00:48 +

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

Log:
php-src karma for Keyur

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2013-02-27 16:29:15 UTC (rev 329588)
+++ SVNROOT/global_avail2013-02-27 21:00:48 UTC (rev 329589)
@@ -22,7 +22,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP, as well as the documentation.

-avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabop,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,joh!
 
annes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,nikic,jawed,ab,ircmaxell,tstarling,tyrael,jpauli,remi,googleguy,ardbiesheuvel,marco|php-src.git,pecl,phpdoc,phd.git,web/doc.git,web/doc-editor.git
+avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabop,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,joh!
 
annes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,nikic,jawed,ab,ircmaxell,tstarling,tyrael,jpauli,remi,googleguy,ardbiesheuvel,marco,keyur|php-src.git,pecl,phpdoc,phd.git,web/doc.git,web/doc-editor.git

 # Engine karma is further restricted (this line MUST come after lines granting
 # php-src karma and before lines granting Zend/TSRM karma)

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Sat, 23 Feb 2013 19:51:29 +

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

Log:
Karma for Marco

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2013-02-23 19:47:10 UTC (rev 329552)
+++ SVNROOT/global_avail2013-02-23 19:51:29 UTC (rev 329553)
@@ -22,7 +22,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP, as well as the documentation.

-avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabop,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,!
 
tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,nikic,jawed,ab,ircmaxell,tstarling,tyrael,jpauli,remi,googleguy,ardbiesheuvel|php-src.git,pecl,phpdoc,phd.git,web/doc.git,web/doc-editor.git
+avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabop,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,!
 
tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,nikic,jawed,ab,ircmaxell,tstarling,tyrael,jpauli,remi,googleguy,ardbiesheuvel,marco|php-src.git,pecl,phpdoc,phd.git,web/doc.git,web/doc-editor.git

 # Engine karma is further restricted (this line MUST come after lines granting
 # php-src karma and before lines granting Zend/TSRM karma)

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Sat, 23 Feb 2013 21:02:53 +

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

Log:
web/news karma for Marco

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2013-02-23 21:01:19 UTC (rev 329559)
+++ SVNROOT/global_avail2013-02-23 21:02:53 UTC (rev 329560)
@@ -63,7 +63,7 @@
 avail|degeberg|web/bugs.git
 avail|ericstewart|web/php.git/archive
 avail|odoucet|web/news.git,web/qa.git
-avail|shein|web/news.git
+avail|shein,marco|web/news.git
 avail|dragoonis,seld,wojak,levim|web/php.git
 avail|stewartlord,danielc,googleguy|web/php.git,web/master.git


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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Thu, 21 Feb 2013 15:41:50 +

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

Log:
pecl/operator karma

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2013-02-21 13:55:10 UTC (rev 329528)
+++ SVNROOT/global_avail2013-02-21 15:41:50 UTC (rev 329529)
@@ -373,6 +373,7 @@
 avail|graphdat|pecl/graphdat,phpdoc
 avail|santiagolizardo|pecl/sdl,phpdoc
 avail|mignov|pecl/virtualization/libvirt.git,phpdoc
+avail|gabrielwu84|pecl/operator,phpdoc

 # Objective-C bridge
 avail|wez,jan|php/php-objc

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

Re: [PHP-CVS] com php-src: Fixed bug #64142 (dval to lval different behavior on ppc64): NEWS Zend/zend_operators.h

[Rasmus Lerdorf]

On 02/05/2013 12:33 AM, Remi Collet wrote:
 Le 05/02/2013 08:54, Stas Malyshev a écrit :
 Hi!

 -   if (d  LONG_MAX) {
 +   if (d = LONG_MAX) {
 return (long)(unsigned long) d;
 }
 return (long) d;

 Could you please explain this one? I thought LONG_MAX is a largest
 permissible long value, why when d==LONG_MAX we need to convert?
 
 LONG_MAX is the largest unsigned value.
 We have different int/float conversion result on some arch (detected, at
 least on ppc64).
 
long l = 0x7fff;
double d;
d = l;
d++;
printf(max+1=%lf, %ld, 0x%lx\n, d, (long)d, (long)d);
printf(max+1=%lf, %ld, 0x%lx\n, d, (long)(unsigned long)d,
 (long)(unsigned long)d);
 
 
 On x86_64
 max+1=9223372036854786048.00, -9223372036854775808, 0x8000
 max+1=9223372036854786048.00, -9223372036854765568, 0x80002800
 
 ON ppc64
 
 max+1=9223372036854775808.00, 9223372036854775807, 0x7fff
 max+1=9223372036854775808.00, -9223372036854775808, 0x8000
 
 So we are in a really border case...
 
 Also, why this patch - which seems to be a BC break since it exhibits
 different behavior on 64-bit systems - needs to be in 5.4?
 
 This patch doesn't change behavior on x86 arch.
 It fixes 9 failed test on ppc64.

I guess the confusion here is that without an #ifdef PPC around this,
how is this not triggering the conversion earlier on x86?

Also, I tried your test program on my x86_64 Linux box and I don't get
the same result:

I get:

max+1=9223372036854775808.00, -9223372036854775808, 0x8000
max+1=9223372036854775808.00, -9223372036854775808, 0x8000

gcc-4.7, glibc-2.15

-Rasmus

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

Re: [PHP-CVS] com php-src: Fixed bug #64142 (dval to lval different behavior on ppc64): NEWS Zend/zend_operators.h

[Rasmus Lerdorf]

On 02/04/2013 06:19 AM, Remi Collet wrote:
 Commit:6533094d9e4d0c85044a170d9fad9a3986a68675
 Author:Remi Collet r...@php.net Mon, 4 Feb 2013 15:19:32 +0100
 Parents:   740b823be80a29e4c6537d4053eb7bad0fae6c41
 Branches:  PHP-5.4 PHP-5.5 master
 
 Link:   
 http://git.php.net/?p=php-src.git;a=commitdiff;h=6533094d9e4d0c85044a170d9fad9a3986a68675

Maybe add a test case for this one?


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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Thu, 31 Jan 2013 18:45:20 +

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

Log:
pecl/solr karma for lukasz

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2013-01-31 16:56:00 UTC (rev 329383)
+++ SVNROOT/global_avail2013-01-31 18:45:20 UTC (rev 329384)
@@ -328,7 +328,7 @@
 avail|sqmk|pecl/sphinx
 avail|basantk|pecl/memsession
 avail|devour|pecl/geoip
-avail|iekpo,fyb3roptik,ecaron|pecl/solr,phpdoc
+avail|iekpo,fyb3roptik,ecaron,lukasz|pecl/solr,phpdoc
 avail|ruslany,ksingla,donraman,jennylaw,ericsten|pecl/wincache,phpdoc
 
avail|pierrick|pecl/networking/mqseries.git,pecl/tools/stomp.git,phpdoc,php-src.git/branches/LEMON
 avail|cyberspice|pecl/dio,pecl/framegrab,phpdoc,pecl/dbus

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Thu, 17 Jan 2013 16:19:43 +

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

Log:
Welcome back Ard

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2013-01-17 15:35:55 UTC (rev 329181)
+++ SVNROOT/global_avail2013-01-17 16:19:43 UTC (rev 329182)
@@ -22,7 +22,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP, as well as the documentation.

-avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,!
 
tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,nikic,jawed,ab,ircmaxell,tstarling,tyrael,jpauli,remi,googleguy|php-src.git,pecl,phpdoc,phd.git,web/doc.git,web/doc-editor.git
+avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,!
 
tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,nikic,jawed,ab,ircmaxell,tstarling,tyrael,jpauli,remi,googleguy,ardbiesheuvel|php-src.git,pecl,phpdoc,phd.git,web/doc.git,web/doc-editor.git

 # Engine karma is further restricted (this line MUST come after lines granting
 # php-src karma and before lines granting Zend/TSRM karma)
@@ -48,7 +48,7 @@
 avail|loudi,mrkschan,pmjones,irker|phd.git,web/doc.git,web/doc-editor.git

 # People who work on the Engine - not people with just tests access
-avail|andi,zeev,andrei,stas,sterling,sas,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire,gron,gopalv,gwynne,pierrick,laruence,cataphract,ab,lstrojny,nikic,jpauli|php-src.git/Zend,php-src.git/TSRM
+avail|andi,zeev,andrei,stas,sterling,sas,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire,gron,gopalv,gwynne,pierrick,laruence,cataphract,ab,lstrojny,nikic,jpauli,ardbiesheuvel|php-src.git/Zend,php-src.git/TSRM

 # The PHP Documentation Group maintains the documentation and its
 # 

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Thu, 17 Jan 2013 16:24:15 +

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

Log:
karma

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail	2013-01-17 16:19:43 UTC (rev 329182)
+++ SVNROOT/global_avail	2013-01-17 16:24:15 UTC (rev 329183)
@@ -53,7 +53,7 @@
 # The PHP Documentation Group maintains the documentation and its
 # translations.

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Thu, 10 Jan 2013 08:34:37 +

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

Log:
Karma

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2013-01-10 05:18:07 UTC (rev 329047)
+++ SVNROOT/global_avail2013-01-10 08:34:37 UTC (rev 329048)
@@ -58,7 +58,7 @@
 # The PHP Web Group maintains www.php.net, news.php.net, bugs.php.net,
 # people.php.net, master.php.net, wiki.php.net, pecl.php.net and qa.php.net.

-avail|salathe,scottmac,jmertic,lsmith,johannes,iliaa,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe,dsp,aharvey,danbrown,moacir,till,vrana,tyrael,nikic,laruence|web/php.git,web/bugs.git,web/master.git,web/news.git,web/php-hosts,web/wiki.git,web/people.git,web/pecl.git,web/qa.git,web/bugs.git
+avail|salathe,scottmac,jmertic,lsmith,johannes,iliaa,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe,dsp,aharvey,danbrown,moacir,till,vrana,tyrael,nikic,laruence,remi,jorton,vdanen|web/php.git,web/bugs.git,web/master.git,web/news.git,web/php-hosts,web/wiki.git,web/people.git,web/pecl.git,web/qa.git,web/bugs.git

 avail|degeberg|web/bugs.git
 avail|ericstewart|web/php.git/archive

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

[PHP-CVS] com php-src: Fix for bug #63811: main/streams/userspace.c

[Rasmus Lerdorf]

Commit:180b9e150b71a2ff80b2a0cf89e2e834d18328e3
Author:Rasmus Lerdorf ras...@php.net Wed, 19 Dec 2012 22:58:18 
-0500
Parents:   66b88c92bb7796b65f2f1da4b04ef91c0ce7a850
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
Fix for bug #63811

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

Changed paths:
  M  main/streams/userspace.c


Diff:
diff --git a/main/streams/userspace.c b/main/streams/userspace.c
index 3b27716..74d9beb 100644
--- a/main/streams/userspace.c
+++ b/main/streams/userspace.c
@@ -458,7 +458,7 @@ static php_stream *user_wrapper_opendir(php_stream_wrapper 
*wrapper, char *filen
us-wrapper = uwrap;
 
us-object = user_stream_create_object(uwrap, context TSRMLS_CC);
-   if(us == NULL) {
+   if(us-object == NULL) {
FG(user_stream_current_filename) = NULL;
efree(us);
return NULL;


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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Fri, 14 Dec 2012 16:48:17 +

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

Log:
Karma

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-12-14 16:02:19 UTC (rev 328784)
+++ SVNROOT/global_avail2012-12-14 16:48:17 UTC (rev 328785)
@@ -328,7 +328,7 @@
 avail|sqmk|pecl/sphinx
 avail|basantk|pecl/memsession
 avail|devour|pecl/geoip
-avail|iekpo,fyb3roptik|pecl/solr,phpdoc
+avail|iekpo,fyb3roptik,ecaron|pecl/solr,phpdoc
 avail|ruslany,ksingla,donraman,jennylaw,ericsten|pecl/wincache,phpdoc
 
avail|pierrick|pecl/networking/mqseries.git,pecl/tools/stomp.git,phpdoc,php-src.git/branches/LEMON
 avail|cyberspice|pecl/dio,pecl/framegrab,phpdoc,pecl/dbus
@@ -369,6 +369,8 @@
 avail|reeze|pecl/leveldb,phpdoc
 avail|krakjoe|pecl/pthreads,phpdoc
 avail|johannes|pecl/database/mysqlnd_memcache.git
+avail|keminar|pecl/smtpmail,phpdoc
+avail|graphdat|pecl/graphdat,phpdoc

 # Objective-C bridge
 avail|wez,jan|php/php-objc

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Sat, 15 Dec 2012 04:48:56 +

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

Log:
karma

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-12-14 16:48:17 UTC (rev 328785)
+++ SVNROOT/global_avail2012-12-15 04:48:56 UTC (rev 328786)
@@ -337,7 +337,7 @@
 avail|bd808|pecl/yaml,phpdoc
 avail|dchill42pecl|pecl/xdom,phpdoc
 avail|hradtke|pecl/memcache,phpdoc
-avail|pdezwart,brodriguez|pecl/amqp,phpdoc
+avail|pdezwart,brodriguez,bkw|pecl/amqp,phpdoc
 avail|ssufficool|php-src.git/ext/pdo_dblib,php-src.git/NEWS
 avail|ben|php-src.git/tests
 avail|yorambh|pecl/apache_accessor,phpdoc

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

[PHP-CVS] com php-src: Fix broken test This was missing a %s for the path here: ext/session/tests/bug60860.phpt

[Rasmus Lerdorf]

Commit:eecdb4c254bafe5fc53b1e06055482944cd3560f
Author:Rasmus Lerdorf ras...@php.net Thu, 13 Dec 2012 16:13:37 
-0800
Parents:   a11606b18fd20be1048a858eb5011fb7117855a9
Branches:  PHP-5.3 PHP-5.4 master

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

Log:
Fix broken test
This was missing a %s for the path here

Changed paths:
  M  ext/session/tests/bug60860.phpt


Diff:
diff --git a/ext/session/tests/bug60860.phpt b/ext/session/tests/bug60860.phpt
index 1231020..223fb35 100644
--- a/ext/session/tests/bug60860.phpt
+++ b/ext/session/tests/bug60860.phpt
@@ -14,4 +14,4 @@ echo ok\n;
 --EXPECTF--
 Warning: session_start(): user session functions not defined in %s on line 3
 
-Fatal error: session_start(): Failed to initialize storage module: user (path: 
) in %s on line 3
+Fatal error: session_start(): Failed to initialize storage module: user (path: 
%s) in %s on line 3


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

Re: [PHP-CVS] com php-src: Fix broken test This was missing a %s for the path here: ext/session/tests/bug60860.phpt

[Rasmus Lerdorf]

I forgot 5.5 initially here and merged it:

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

Not sure why there was no email notification about that.

On 12/13/2012 04:13 PM, Rasmus Lerdorf wrote:
 Commit:eecdb4c254bafe5fc53b1e06055482944cd3560f
 Author:Rasmus Lerdorf ras...@php.net Thu, 13 Dec 2012 16:13:37 
 -0800
 Parents:   a11606b18fd20be1048a858eb5011fb7117855a9
 Branches:  PHP-5.3 PHP-5.4 master
 
 Link:   
 http://git.php.net/?p=php-src.git;a=commitdiff;h=eecdb4c254bafe5fc53b1e06055482944cd3560f
 
 Log:
 Fix broken test
 This was missing a %s for the path here
 
 Changed paths:
   M  ext/session/tests/bug60860.phpt
 
 
 Diff:
 diff --git a/ext/session/tests/bug60860.phpt b/ext/session/tests/bug60860.phpt
 index 1231020..223fb35 100644
 --- a/ext/session/tests/bug60860.phpt
 +++ b/ext/session/tests/bug60860.phpt
 @@ -14,4 +14,4 @@ echo ok\n;
  --EXPECTF--
  Warning: session_start(): user session functions not defined in %s on line 3
  
 -Fatal error: session_start(): Failed to initialize storage module: user 
 (path: ) in %s on line 3
 +Fatal error: session_start(): Failed to initialize storage module: user 
 (path: %s) in %s on line 3
 
 


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

[PHP-CVS] com php-src: Fix broken test Need to use the configured connection parameters here. We can't assume the test user has access.: ext/mysqli/tests/bug63398.phpt

[Rasmus Lerdorf]

Commit:9d1bc1b622f1c28a55fe4dc4e87e111aff6ed8b8
Author:Rasmus Lerdorf ras...@php.net Thu, 13 Dec 2012 16:41:56 
-0800
Parents:   eecdb4c254bafe5fc53b1e06055482944cd3560f
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

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

Log:
Fix broken test
Need to use the configured connection parameters here. We can't assume
the test user has access.

Changed paths:
  M  ext/mysqli/tests/bug63398.phpt


Diff:
diff --git a/ext/mysqli/tests/bug63398.phpt b/ext/mysqli/tests/bug63398.phpt
index 6dffa8c..26d00c9 100644
--- a/ext/mysqli/tests/bug63398.phpt
+++ b/ext/mysqli/tests/bug63398.phpt
@@ -10,7 +10,7 @@ if (!$IS_MYSQLND) {
 ?
 --FILE--
 ?php
-$link = new mysqli('localhost', 'test', NULL, 'test');
+$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 mysqli_close($link);


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

[PHP-CVS] com php-src: Need connect.inc here: ext/mysqli/tests/bug63398.phpt

[Rasmus Lerdorf]

Commit:7a49e09fd8ef612df45e540a5b1895b045c46235
Author:Rasmus Lerdorf ras...@php.net Thu, 13 Dec 2012 16:54:16 
-0800
Parents:   9d1bc1b622f1c28a55fe4dc4e87e111aff6ed8b8
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

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

Log:
Need connect.inc here

Changed paths:
  M  ext/mysqli/tests/bug63398.phpt


Diff:
diff --git a/ext/mysqli/tests/bug63398.phpt b/ext/mysqli/tests/bug63398.phpt
index 26d00c9..f3cd322 100644
--- a/ext/mysqli/tests/bug63398.phpt
+++ b/ext/mysqli/tests/bug63398.phpt
@@ -10,6 +10,7 @@ if (!$IS_MYSQLND) {
 ?
 --FILE--
 ?php
+require 'connect.inc';
 $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 mysqli_close($link);


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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Thu, 22 Nov 2012 21:54:36 +

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

Log:
master karma for Sherif

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-11-22 21:47:37 UTC (rev 328458)
+++ SVNROOT/global_avail2012-11-22 21:54:36 UTC (rev 328459)
@@ -65,7 +65,7 @@
 avail|odoucet|web/news.git,web/qa.git
 avail|shein|web/news.git
 avail|dragoonis,seld,wojak,levim|web/php.git
-avail|stewartlord,danielc|web/php.git,web/master.git
+avail|stewartlord,danielc,googleguy|web/php.git,web/master.git

 # The PHP Release Masters publish PHP distributions on php.net/distributions
 avail|iliaa,johannes,stas,dsp|web/php-distributions.git

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

Re: [PHP-CVS] com php-src: These need to be volatile in order to prevent leaking after the longjmp in the error handler: ext/gd/libgd/gd_png.c

[Rasmus Lerdorf]

On 11/06/2012 12:06 PM, Nuno Lopes wrote:
 While I won't oppose this patch since it has no performance impact, I
 believe this is a bug in the compiler and not in the code below.
 The compiler should know about setjmp(). glibc, for example, marks that
 function with __attribute__((returns_twice)).

Yeah, I don't disagree, but I also don't see a problem with helping the
compiler a bit here and it fixes a leak which bit someone badly.

-Rasmus


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

[PHP-CVS] com php-src: These need to be volatile in order to prevent leaking after the longjmp in the error handler: ext/gd/libgd/gd_png.c

[Rasmus Lerdorf]

Commit:f452b9056e89aa1bf18d6c0828ba709c0f8df854
Author:Rasmus Lerdorf ras...@php.net Mon, 5 Nov 2012 20:56:19 
-0800
Parents:   153bfada90b0733943c31e9d7e2bee57c5e7bcac
Branches:  PHP-5.4

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

Log:
These need to be volatile in order to prevent leaking after the
longjmp in the error handler

Changed paths:
  M  ext/gd/libgd/gd_png.c


Diff:
diff --git a/ext/gd/libgd/gd_png.c b/ext/gd/libgd/gd_png.c
index 49f7cb0..bdbb7ee 100644
--- a/ext/gd/libgd/gd_png.c
+++ b/ext/gd/libgd/gd_png.c
@@ -127,8 +127,8 @@ gdImagePtr gdImageCreateFromPngCtx (gdIOCtx * infile)
png_color_16p trans_gray_rgb;
png_color_16p trans_color_rgb;
png_bytep trans;
-   png_bytep image_data = NULL;
-   png_bytepp row_pointers = NULL;
+   volatile png_bytep image_data = NULL;
+   volatile png_bytepp row_pointers = NULL;
gdImagePtr im = NULL;
int i, j, *open = NULL;
volatile int transparent = -1;


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

[PHP-CVS] com php-src: These need to be volatile in order to prevent leaking after the longjmp in the error handler: ext/gd/libgd/gd_png.c

[Rasmus Lerdorf]

Commit:261e32f6236429fcccf61e80262c9df9589d494c
Author:Rasmus Lerdorf ras...@php.net Mon, 5 Nov 2012 20:56:19 
-0800
Parents:   7bcb8780e0ed042888f88c78919b7726be9ea931
Branches:  master

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

Log:
These need to be volatile in order to prevent leaking after the
longjmp in the error handler

Changed paths:
  M  ext/gd/libgd/gd_png.c


Diff:
diff --git a/ext/gd/libgd/gd_png.c b/ext/gd/libgd/gd_png.c
index 49f7cb0..bdbb7ee 100644
--- a/ext/gd/libgd/gd_png.c
+++ b/ext/gd/libgd/gd_png.c
@@ -127,8 +127,8 @@ gdImagePtr gdImageCreateFromPngCtx (gdIOCtx * infile)
png_color_16p trans_gray_rgb;
png_color_16p trans_color_rgb;
png_bytep trans;
-   png_bytep image_data = NULL;
-   png_bytepp row_pointers = NULL;
+   volatile png_bytep image_data = NULL;
+   volatile png_bytepp row_pointers = NULL;
gdImagePtr im = NULL;
int i, j, *open = NULL;
volatile int transparent = -1;


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

[PHP-CVS] com php-src: These need to be volatile in order to prevent leaking after the longjmp in the error handler: ext/gd/libgd/gd_png.c

[Rasmus Lerdorf]

Commit:f8c280d85a3fc5b02e9b19f4e23ddac233abf1e4
Author:Rasmus Lerdorf ras...@php.net Mon, 5 Nov 2012 20:56:19 
-0800
Parents:   90bd54c46e0195f65a1a49ac0c01f139915a2dd3
Branches:  PHP-5.3

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

Log:
These need to be volatile in order to prevent leaking after the
longjmp in the error handler

Changed paths:
  M  ext/gd/libgd/gd_png.c


Diff:
diff --git a/ext/gd/libgd/gd_png.c b/ext/gd/libgd/gd_png.c
index 49f7cb0..bdbb7ee 100644
--- a/ext/gd/libgd/gd_png.c
+++ b/ext/gd/libgd/gd_png.c
@@ -127,8 +127,8 @@ gdImagePtr gdImageCreateFromPngCtx (gdIOCtx * infile)
png_color_16p trans_gray_rgb;
png_color_16p trans_color_rgb;
png_bytep trans;
-   png_bytep image_data = NULL;
-   png_bytepp row_pointers = NULL;
+   volatile png_bytep image_data = NULL;
+   volatile png_bytepp row_pointers = NULL;
gdImagePtr im = NULL;
int i, j, *open = NULL;
volatile int transparent = -1;


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

[PHP-CVS] com php-src: News entry for png memleak fix: NEWS

[Rasmus Lerdorf]

Commit:7caca1614beaaab581c9ed3be002745af25cf971
Author:Rasmus Lerdorf ras...@php.net Mon, 5 Nov 2012 21:04:33 
-0800
Parents:   f452b9056e89aa1bf18d6c0828ba709c0f8df854
Branches:  PHP-5.4

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

Log:
News entry for png memleak fix

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 293dcb0..d476cec 100644
--- a/NEWS
+++ b/NEWS
@@ -1341,6 +1341,7 @@ PHP   
 NEWS
 - Gd:
   . Fixed bug #60160 (imagefill() doesn't work correctly
 for small images). (Florian)
+  . Fixed potential memory leak on a png error (Rasmus, Paul Saab)
 
 - Intl:
   . Fixed bug #60192 (SegFault when Collator not constructed


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

[PHP-CVS] com php-src: News entry for png memleak fix: NEWS

[Rasmus Lerdorf]

Commit:0ee5d18f91d731636f3ba39c7487e2a8cf04fa36
Author:Rasmus Lerdorf ras...@php.net Mon, 5 Nov 2012 21:06:18 
-0800
Parents:   a983ded9bd0df0acd81755704a29ff098c4a6808
Branches:  PHP-5.3

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

Log:
News entry for png memleak fix

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 2e1f13b..83274c2 100644
--- a/NEWS
+++ b/NEWS
@@ -1395,6 +1395,7 @@ PHP   
 NEWS
 
 - GD extension:
   . Fixed bug #53492 (fix crash if anti-aliasing steps are invalid). (Pierre)
+  . Fixed potential memory leak on a png error (Rasmus, Paul Saab)
 
 - GMP extension:
   . Fixed bug #52906 (gmp_mod returns negative result when non-negative is


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

[PHP-CVS] com php-src: Fix folding: main/main.c

[Rasmus Lerdorf]

Commit:2322be0fab44401cb2bc624771299ae6f598ee4e
Author:Rasmus Lerdorf ras...@php.net Thu, 20 Sep 2012 14:22:15 
-0400
Parents:   3b38d14caf24233ed476e4892f53ffd858d1ae3f
Branches:  PHP-5.4

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

Log:
Fix folding

Changed paths:
  M  main/main.c


Diff:
diff --git a/main/main.c b/main/main.c
index 709c6dd..8d97581 100644
--- a/main/main.c
+++ b/main/main.c
@@ -597,6 +597,7 @@ PHPAPI int php_get_module_initialized(void)
 {
return module_initialized;
 }
+/* }}} */
 
 /* {{{ php_log_err
  */


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

[PHP-CVS] com php-src: Fix folding: main/main.c

[Rasmus Lerdorf]

Commit:fa5477d9d45f076f4b4a6c50252668e2a437230b
Author:Rasmus Lerdorf ras...@php.net Thu, 20 Sep 2012 14:24:55 
-0400
Parents:   4b9ed492177dd9d6e1fde7f0b74ece8a71a1c1ab
Branches:  master

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

Log:
Fix folding

Changed paths:
  M  main/main.c


Diff:
diff --git a/main/main.c b/main/main.c
index 5eb9947..3e31a8d 100644
--- a/main/main.c
+++ b/main/main.c
@@ -596,6 +596,7 @@ PHPAPI int php_get_module_initialized(void)
 {
return module_initialized;
 }
+/* }}} */
 
 /* {{{ php_log_err
  */


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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Tue, 11 Sep 2012 16:08:24 +

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

Log:
pecl/leveldb karma for reeze

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-09-11 15:06:20 UTC (rev 327609)
+++ SVNROOT/global_avail2012-09-11 16:08:24 UTC (rev 327610)
@@ -364,6 +364,7 @@
 avail|ioseb|pecl/uri-template,phpdoc
 avail|edward|pecl/kadm5,phpdoc
 avail|zhangzhenyu|pecl/yar,phpdoc
+avail|reeze|pecl/leveldb,phpdoc

 # Objective-C bridge
 avail|wez,jan|php/php-objc

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Sun, 26 Aug 2012 15:38:44 +

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

Log:
Zend karma for lstrojny

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-08-26 15:17:57 UTC (rev 327288)
+++ SVNROOT/global_avail2012-08-26 15:38:44 UTC (rev 327289)
@@ -48,7 +48,7 @@
 avail|loudi,mrkschan,pmjones,irker|phd.git,web/doc.git,web/doc-editor.git

 # People who work on the Engine - not people with just tests access
-avail|andi,zeev,andrei,stas,sterling,sas,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire,gron,gopalv,gwynne,pierrick,laruence,cataphract,ab|php-src.git/Zend,php-src.git/TSRM
+avail|andi,zeev,andrei,stas,sterling,sas,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire,gron,gopalv,gwynne,pierrick,laruence,cataphract,ab,lstrojny|php-src.git/Zend,php-src.git/TSRM

 # The PHP Documentation Group maintains the documentation and its
 # translations.

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Sun, 26 Aug 2012 15:59:31 +

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

Log:
php-src karma for Tyrael

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-08-26 15:38:44 UTC (rev 327289)
+++ SVNROOT/global_avail2012-08-26 15:59:31 UTC (rev 327290)
@@ -22,7 +22,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP, as well as the documentation.

-avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,!
 
tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,nikic,jawed,ab,ircmaxell,tstarling|php-src.git,pecl,phpdoc,phd.git,web/doc.git,web/doc-editor.git
+avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,!
 
tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,nikic,jawed,ab,ircmaxell,tstarling,tyrael|php-src.git,pecl,phpdoc,phd.git,web/doc.git,web/doc-editor.git

 # Engine karma is further restricted (this line MUST come after lines granting
 # php-src karma and before lines granting Zend/TSRM karma)

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Mon, 13 Aug 2012 17:02:26 +

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

Log:
Zend karma for ab

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-08-13 13:07:54 UTC (rev 327103)
+++ SVNROOT/global_avail2012-08-13 17:02:26 UTC (rev 327104)
@@ -48,7 +48,7 @@
 avail|loudi,mrkschan,pmjones,irker|phd.git,web/doc.git,web/doc-editor.git

 # People who work on the Engine - not people with just tests access
-avail|andi,zeev,andrei,stas,sterling,sas,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire,gron,gopalv,gwynne,pierrick,laruence,cataphract|php-src.git/Zend,php-src.git/TSRM
+avail|andi,zeev,andrei,stas,sterling,sas,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire,gron,gopalv,gwynne,pierrick,laruence,cataphract,ab|php-src.git/Zend,php-src.git/TSRM

 # The PHP Documentation Group maintains the documentation and its
 # translations.

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Sun, 12 Aug 2012 16:47:31 +

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

Log:
More karma for nikic and laruence

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-08-12 16:16:37 UTC (rev 327077)
+++ SVNROOT/global_avail2012-08-12 16:47:31 UTC (rev 327078)
@@ -58,7 +58,7 @@
 # The PHP Web Group maintains www.php.net, news.php.net, bugs.php.net,
 # people.php.net, master.php.net, wiki.php.net, pecl.php.net and qa.php.net.

-avail|salathe,scottmac,jmertic,lsmith,johannes,iliaa,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe,dsp,aharvey,danbrown,moacir,till,vrana,tyrael|web/php.git,web/bugs.git,web/master.git,web/news.git,web/php-hosts,web/wiki.git,web/people.git,web/pecl.git,web/qa.git,web/bugs.git
+avail|salathe,scottmac,jmertic,lsmith,johannes,iliaa,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe,dsp,aharvey,danbrown,moacir,till,vrana,tyrael,nikic,laruence|web/php.git,web/bugs.git,web/master.git,web/news.git,web/php-hosts,web/wiki.git,web/people.git,web/pecl.git,web/qa.git,web/bugs.git

 avail|degeberg|web/bugs.git
 avail|ericstewart|web/php.git/archive

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Tue, 24 Jul 2012 18:56:50 +

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

Log:
karma

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail	2012-07-24 17:10:02 UTC (rev 326796)
+++ SVNROOT/global_avail	2012-07-24 18:56:50 UTC (rev 326797)
@@ -53,7 +53,7 @@
 # The PHP Documentation Group maintains the documentation and its
 # translations.

[PHP-CVS] com php-src: Fix bug #62654: sapi/fpm/fpm/fpm_sockets.c

[Rasmus Lerdorf]

Commit:5f224412fa6892645ca548ac75f20ff8743ed916
Author:Rasmus Lerdorf ras...@php.net Tue, 24 Jul 2012 16:28:49 
-0700
Parents:   54cba5aa91c58e2bcfa7957f72d5f4553c0dd265
Branches:  PHP-5.4

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

Log:
Fix bug #62654

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

Changed paths:
  M  sapi/fpm/fpm/fpm_sockets.c


Diff:
diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c
index d24dccc..f56b9cf 100644
--- a/sapi/fpm/fpm/fpm_sockets.c
+++ b/sapi/fpm/fpm/fpm_sockets.c
@@ -455,11 +455,11 @@ int fpm_socket_get_listening_queue(int sock, unsigned 
*cur_lq, unsigned *max_lq)
 
 #endif
 
-int fpm_socket_unix_test_connect(struct sockaddr_un *sun, size_t socklen) /* 
{{{ */
+int fpm_socket_unix_test_connect(struct sockaddr_un *sock, size_t socklen) /* 
{{{ */
 {
int fd;
 
-   if (!sun || sun-sun_family != AF_UNIX) {
+   if (!sock || sock-sun_family != AF_UNIX) {
return -1;
}
 
@@ -467,7 +467,7 @@ int fpm_socket_unix_test_connect(struct sockaddr_un *sun, 
size_t socklen) /* {{{
return -1;
}
 
-   if (connect(fd, (struct sockaddr *)sun, socklen) == -1) {
+   if (connect(fd, (struct sockaddr *)sock, socklen) == -1) {
return -1;
}


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

[PHP-CVS] com php-src: Fix bug #62654: sapi/fpm/fpm/fpm_sockets.c

[Rasmus Lerdorf]

Commit:a05e07ea1f75b8021c9b64bf93ff970873375d97
Author:Rasmus Lerdorf ras...@php.net Tue, 24 Jul 2012 16:28:49 
-0700
Parents:   f356be68c244dd0dd70894ac4a5c9b4e3a882e04
Branches:  PHP-5.4

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

Log:
Fix bug #62654

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

Changed paths:
  M  sapi/fpm/fpm/fpm_sockets.c


Diff:
diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c
index d24dccc..f56b9cf 100644
--- a/sapi/fpm/fpm/fpm_sockets.c
+++ b/sapi/fpm/fpm/fpm_sockets.c
@@ -455,11 +455,11 @@ int fpm_socket_get_listening_queue(int sock, unsigned 
*cur_lq, unsigned *max_lq)
 
 #endif
 
-int fpm_socket_unix_test_connect(struct sockaddr_un *sun, size_t socklen) /* 
{{{ */
+int fpm_socket_unix_test_connect(struct sockaddr_un *sock, size_t socklen) /* 
{{{ */
 {
int fd;
 
-   if (!sun || sun-sun_family != AF_UNIX) {
+   if (!sock || sock-sun_family != AF_UNIX) {
return -1;
}
 
@@ -467,7 +467,7 @@ int fpm_socket_unix_test_connect(struct sockaddr_un *sun, 
size_t socklen) /* {{{
return -1;
}
 
-   if (connect(fd, (struct sockaddr *)sun, socklen) == -1) {
+   if (connect(fd, (struct sockaddr *)sock, socklen) == -1) {
return -1;
}


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

[PHP-CVS] com php-src: Fix bug #62654: sapi/fpm/fpm/fpm_sockets.c

[Rasmus Lerdorf]

Commit:0fbc8561e687689f796d95584cea1fa959eee83b
Author:Rasmus Lerdorf ras...@php.net Tue, 24 Jul 2012 16:28:49 
-0700
Parents:   f356be68c244dd0dd70894ac4a5c9b4e3a882e04
Branches:  master

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

Log:
Fix bug #62654

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

Changed paths:
  M  sapi/fpm/fpm/fpm_sockets.c


Diff:
diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c
index d24dccc..f56b9cf 100644
--- a/sapi/fpm/fpm/fpm_sockets.c
+++ b/sapi/fpm/fpm/fpm_sockets.c
@@ -455,11 +455,11 @@ int fpm_socket_get_listening_queue(int sock, unsigned 
*cur_lq, unsigned *max_lq)
 
 #endif
 
-int fpm_socket_unix_test_connect(struct sockaddr_un *sun, size_t socklen) /* 
{{{ */
+int fpm_socket_unix_test_connect(struct sockaddr_un *sock, size_t socklen) /* 
{{{ */
 {
int fd;
 
-   if (!sun || sun-sun_family != AF_UNIX) {
+   if (!sock || sock-sun_family != AF_UNIX) {
return -1;
}
 
@@ -467,7 +467,7 @@ int fpm_socket_unix_test_connect(struct sockaddr_un *sun, 
size_t socklen) /* {{{
return -1;
}
 
-   if (connect(fd, (struct sockaddr *)sun, socklen) == -1) {
+   if (connect(fd, (struct sockaddr *)sock, socklen) == -1) {
return -1;
}


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

Re: [PHP-CVS] del php-src: .travis.yml LICENSE Makefile.gcov NEWS README.md UPGRADING UPGRADING.INTERNALS Zend/tests/bug18556.phpt Zend/tests/bug60738.phpt Zend/tests/bug61681.phpt Zend/tests/const_de

[Rasmus Lerdorf]

On 07/24/2012 05:18 PM, Stas Malyshev wrote:
 Hi!
 
 On 7/24/12 5:15 PM, Johannes Schlüter wrote:
 Branch: PHP-5.4
 Deleted commits count: 2298
 User: Johannes Schlüter johan...@php.net Wed, 25 Jul 2012 00:15:30 
 +

 
 What does this push do?
 

It reverses the mess I caused. I had no idea I did it, and the commit
messages didn't show it, but I merged master into 5.4 and pushed it. The
commit message just showed the trivial sun/sock fpm change, but what
actually happened was that I changed the 5.4 tree into master at the
same time. I really really hate that a simple client-side mistake can
cause silent massive code changes like this.

So, what I did to cause it was to do a 'git rebase master' in the 5.4
branch. Just muscle memory from working all day in an environment where
we develop in master all the time. The forced-push restriction we put in
to try to prevent this kind of mass-repo-fuck doesn't catch this
particular kind of fuckyness.

-Rasmus

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Wed, 20 Jun 2012 15:55:10 +

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

Log:
Karma for nathanb

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-06-20 14:56:00 UTC (rev 326271)
+++ SVNROOT/global_avail2012-06-20 15:55:10 UTC (rev 326272)
@@ -343,7 +343,7 @@
 avail|mbechler|pecl/krb5,phpdoc
 avail|cubrid|pecl/cubrid,phpdoc
 avail|treffynnon|pecl/ssdeep,phpdoc
-avail|nicolas|pecl/judy,phpdoc
+avail|nicolas,nathanb|pecl/judy,phpdoc
 avail|hanez|pecl/pcsc,phpdoc
 avail|martynas|pecl/htscanner,phpdoc
 avail|dthompsono99|pecl/xcb,phpdoc

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Wed, 20 Jun 2012 16:02:37 +

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

Log:
More karma

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-06-20 15:55:10 UTC (rev 326272)
+++ SVNROOT/global_avail2012-06-20 16:02:37 UTC (rev 326273)
@@ -13,7 +13,7 @@

 # Some people also have access to the configuration files in the SVNROOT.

-avail|sterling,goba,imajes,wez,iliaa,derick,jon,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith,bjori,dsp|SVNROOT
+avail|sterling,goba,imajes,wez,iliaa,derick,jon,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith,bjori,dsp,felipe|SVNROOT

 # Some PEAR people get access to the pear-specific avail file in SVNROOT.

@@ -22,7 +22,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP, as well as the documentation.

-avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,!
 
tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,nikic,jawed,ab|php-src.git,pecl,phpdoc,phd.git,web/doc.git,web/doc-editor.git
+avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,!
 
tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,nikic,jawed,ab,ircmaxell|php-src.git,pecl,phpdoc,phd.git,web/doc.git,web/doc-editor.git

 # Engine karma is further restricted (this line MUST come after lines granting
 # php-src karma and before lines granting Zend/TSRM karma)

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Fri, 15 Jun 2012 20:19:12 +

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

Log:
Add jgmdev

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-06-15 14:56:50 UTC (rev 326187)
+++ SVNROOT/global_avail2012-06-15 20:19:12 UTC (rev 326188)
@@ -293,7 +293,7 @@
 avail|bdeshong|pecl/usblib
 avail|francois|pecl/phk,pecl/automap
 avail|ramsey|pecl/uploadprogress,pecl/pdo_user
-avail|seariver|pecl/wxwidgets
+avail|seariver,jgmdev|pecl/wxwidgets
 avail|pestilence669|pecl/xrange
 avail|mlively,dzenovich|pecl/runkit,pecl/classkit
 avail|thierry|pecl/fam

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

[PHP-CVS] com php-src: Fix broken apache_request_headers test: sapi/cgi/tests/apache_request_headers.phpt

[Rasmus Lerdorf]

Commit:523fd2c244ccc5c89d5bef2c3719f17782d8b6fa
Author:Rasmus Lerdorf ras...@php.net Wed, 23 May 2012 17:37:13 
-0700
Parents:   acd711685a592c52be200e248154283c6c49c9f8
Branches:  PHP-5.4

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

Log:
Fix broken apache_request_headers test

This test depends on the default_charset setting, so set it to
UTF-8 for consistent output

Changed paths:
  M  sapi/cgi/tests/apache_request_headers.phpt


Diff:
diff --git a/sapi/cgi/tests/apache_request_headers.phpt 
b/sapi/cgi/tests/apache_request_headers.phpt
index 2c82d57..3dc3580 100644
--- a/sapi/cgi/tests/apache_request_headers.phpt
+++ b/sapi/cgi/tests/apache_request_headers.phpt
@@ -1,5 +1,7 @@
 --TEST--
 apache_request_headers() stack overflow.
+--INI--
+default_charset=UTF-8
 --SKIPIF--
 ?php 
 include skipif.inc; 
@@ -29,7 +31,7 @@ echo Done\n;
 ?
 --EXPECTF--
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 Array
 (


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

[PHP-CVS] com php-src: This test depends on the default_charset setting, so set it to UTF-8 for consistent output: sapi/cgi/tests/apache_request_headers.phpt

[Rasmus Lerdorf]

Commit:8208462fc1ffcc575aa631ffb4cda22e2247521a
Author:Rasmus Lerdorf ras...@php.net Wed, 23 May 2012 17:37:13 
-0700
Parents:   ca515e807319cafb5ad5c7384422583fb633aa57
Branches:  master

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

Log:
This test depends on the default_charset setting, so set it to
UTF-8 for consistent output

Changed paths:
  M  sapi/cgi/tests/apache_request_headers.phpt


Diff:
diff --git a/sapi/cgi/tests/apache_request_headers.phpt 
b/sapi/cgi/tests/apache_request_headers.phpt
index 2c82d57..3dc3580 100644
--- a/sapi/cgi/tests/apache_request_headers.phpt
+++ b/sapi/cgi/tests/apache_request_headers.phpt
@@ -1,5 +1,7 @@
 --TEST--
 apache_request_headers() stack overflow.
+--INI--
+default_charset=UTF-8
 --SKIPIF--
 ?php 
 include skipif.inc; 
@@ -29,7 +31,7 @@ echo Done\n;
 ?
 --EXPECTF--
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 Array
 (


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

[PHP-CVS] com php-src: Fix grammo: ext/standard/filestat.c

[Rasmus Lerdorf]

Commit:cd16174f14a93b89f064108d72b4fb612345de8f
Author:Rasmus Lerdorf ras...@php.net Sun, 13 May 2012 11:45:41 
-0700
Parents:   b50101764ba0f8d61c010886aca812e740c8193c
Branches:  master

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

Log:
Fix grammo

Changed paths:
  M  ext/standard/filestat.c


Diff:
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index bfe1abd..b908df9 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -803,7 +803,7 @@ PHP_FUNCTION(touch)
 PHPAPI void php_clear_stat_cache(zend_bool clear_realpath_cache, const char 
*filename, int filename_len TSRMLS_DC)
 {
/* always clear CurrentStatFile and CurrentLStatFile even if filename 
is not NULL
-* as it may contains outdated data (e.g. nlink for a directory when 
deleting a file
+* as it may contain outdated data (e.g. nlink for a directory when 
deleting a file
 * in this directory, as shown by lstat_stat_variation9.phpt) */
if (BG(CurrentStatFile)) {
efree(BG(CurrentStatFile));


--
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': ext/standard/filestat.c

[Rasmus Lerdorf]

Commit:8da61c62d931bb76faba55bb2fcbd1938b2f96fc
Author:Rasmus Lerdorf ras...@php.net Sun, 13 May 2012 11:48:25 
-0700
Parents:   5852e5f48d7b013108b98b9c57c18383765d21ea 
cd16174f14a93b89f064108d72b4fb612345de8f
Branches:  master

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

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix grammo

Changed paths:
  MM  ext/standard/filestat.c


Diff:



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

[PHP-CVS] com karma: Turn off git emails temporarily: lib/Mail.php

[Rasmus Lerdorf]

Commit:2ce04e3b10c84bb5e2a4410e89df23b1dec8ffab
Author:Rasmus Lerdorf ras...@php.net Wed, 28 Mar 2012 22:51:40 
-0700
Parents:   3082cb40bcf3f11894b70ccd735ecda9f94fc899
Branches:  master

Link:   
http://git.php.net/?p=karma.git;a=commitdiff;h=2ce04e3b10c84bb5e2a4410e89df23b1dec8ffab

Log:
Turn off git emails temporarily

Changed paths:
  M  lib/Mail.php


Diff:
2ce04e3b10c84bb5e2a4410e89df23b1dec8ffab
diff --git a/lib/Mail.php b/lib/Mail.php
index 7c63a41..7651876 100644
--- a/lib/Mail.php
+++ b/lib/Mail.php
@@ -220,6 +220,6 @@ class Mail
 $headers = $this-makeHeaders();
 $body = $this-makeBody();
 
-return mail($receivers, $subject, $body, $headers);
+#return mail($receivers, $subject, $body, $headers);
 }
 }


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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ UPGRADING

[Rasmus Lerdorf]

rasmus   Mon, 12 Mar 2012 06:11:58 +

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

Log:
This change was badly worded and filed in the wrong section.
This isn't an ini change at all.

Changed paths:
U   php/php-src/branches/PHP_5_4/UPGRADING

Modified: php/php-src/branches/PHP_5_4/UPGRADING
===
--- php/php-src/branches/PHP_5_4/UPGRADING  2012-03-12 05:58:15 UTC (rev 
324123)
+++ php/php-src/branches/PHP_5_4/UPGRADING  2012-03-12 06:11:58 UTC (rev 
324124)
@@ -36,15 +36,6 @@
 1. Changes to INI directives
 =

-- The default character set is now UTF-8 when the default_charset
-  php.ini directive is not explicitly set. This applies to functions
-  such as htmlentities() and htmlspecialchars(). If you were relying
-  on the previous default of ISO-8859-1 you will need to add:
-
-default_charset = iso-8859-1
-
-  to your php.ini to preserve pre-PHP 5.4 behavior.
-
 - PHP 5.4 now checks at compile time if /dev/urandom or /dev/arandom
   are present.  If either is available, session.entropy_file now
   defaults to that file and session.entropy_length defaults to 32.
@@ -200,6 +191,13 @@

 - call_user_func_array() no longer allows call-time pass by reference.

+- the default character set for htmlspecialchars() and htmlentities() is
+  now UTF-8. In previous versions it was ISO-8859-1. Note that changing
+  your output charset via the php.ini default_charset directive does not
+  affect htmlspecialchars/htmlentities unless you are passing  (an
+  empty string) as the encoding parameter to your htmlspecialchars/htmlentities
+  calls.
+
 - htmlentities() and htmlspecialchars() are stricter in the code units they
   accept for the asian encodings. For Big5-HKSCS, the octets 0x80 and 0xFF are
   rejected.  For GB2312/EUC-CN, the octets 0x8E, 0x8F, 0xA0 and 0xFF are

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS

[Rasmus Lerdorf]

rasmus   Mon, 12 Mar 2012 15:21:15 +

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

Log:
Remove reference to default_charset here since the it isn't
really about the ini option at all. That only comes into play
when you force it by passing and empty encoding string to those
functions.

Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-12 14:52:02 UTC (rev 324159)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-12 15:21:15 UTC (rev 324160)
@@ -168,8 +168,8 @@
   . Changed error handlers to only generate docref links when the docref_root
 php.ini setting is not empty. (Derick)
   . Changed silent conversion of array to string to produce a notice. (Patrick)
-  . Changed default value of default_charset php.ini option from ISO-8859-1 
to
-UTF-8. (Rasmus)
+  . Changed default encoding from ISO-8859-1 to UTF-8 when not specified in
+htmlspecialchars and htmlentities. (Rasmus)
   . Changed casting of null/''/false into an Object when adding a property
 from E_STRICT into a warning. (Scott)
   . Changed E_ALL to include E_STRICT. (Stas)

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/date/tests/bug20382-2.phpt trunk/ext/date/tests/bug20382-2.phpt

[Rasmus Lerdorf]

rasmus   Fri, 02 Mar 2012 17:03:19 +

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

Log:
Armenia is smarter than the rest of us. They have dropped DST.
http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
Fix the test to reflect that.

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/date/tests/bug20382-2.phpt
U   php/php-src/trunk/ext/date/tests/bug20382-2.phpt

Modified: php/php-src/branches/PHP_5_4/ext/date/tests/bug20382-2.phpt
===
--- php/php-src/branches/PHP_5_4/ext/date/tests/bug20382-2.phpt 2012-03-02 
17:02:45 UTC (rev 323828)
+++ php/php-src/branches/PHP_5_4/ext/date/tests/bug20382-2.phpt 2012-03-02 
17:03:19 UTC (rev 323829)
@@ -75,7 +75,7 @@
 wanted = Monday00:00:00

 Asia/Yerevan
-ts = Monday 2037-10-19 17:17:17 AMST
+ts = Monday 2037-10-19 17:17:17 AMT
 result = Monday 2037-10-26 00:00:00 AMT
 wanted = Monday00:00:00


Modified: php/php-src/trunk/ext/date/tests/bug20382-2.phpt
===
--- php/php-src/trunk/ext/date/tests/bug20382-2.phpt2012-03-02 17:02:45 UTC 
(rev 323828)
+++ php/php-src/trunk/ext/date/tests/bug20382-2.phpt2012-03-02 17:03:19 UTC 
(rev 323829)
@@ -75,7 +75,7 @@
 wanted = Monday00:00:00

 Asia/Yerevan
-ts = Monday 2037-10-19 17:17:17 AMST
+ts = Monday 2037-10-19 17:17:17 AMT
 result = Monday 2037-10-26 00:00:00 AMT
 wanted = Monday00:00:00


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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/date/tests/ bug20382-2.phpt

[Rasmus Lerdorf]

rasmus   Fri, 02 Mar 2012 17:08:00 +

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

Log:
Missed 5.3 for the Armenia DST drop

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/date/tests/bug20382-2.phpt

Modified: php/php-src/branches/PHP_5_3/ext/date/tests/bug20382-2.phpt
===
--- php/php-src/branches/PHP_5_3/ext/date/tests/bug20382-2.phpt 2012-03-02 
17:06:53 UTC (rev 323833)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/bug20382-2.phpt 2012-03-02 
17:08:00 UTC (rev 323834)
@@ -75,7 +75,7 @@
 wanted = Monday00:00:00

 Asia/Yerevan
-ts = Monday 2037-10-19 17:17:17 AMST
+ts = Monday 2037-10-19 17:17:17 AMT
 result = Monday 2037-10-26 00:00:00 AMT
 wanted = Monday00:00:00


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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/main/ php.h

[Rasmus Lerdorf]

rasmus   Thu, 01 Mar 2012 22:34:23 +

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

Log:
Merge fix for bug 61193

Bug: https://bugs.php.net/61193 (Closed) PHP_EOL definition for Mac OS X is 
wrong and unused
  
Changed paths:
U   php/php-src/branches/PHP_5_4/main/php.h

Modified: php/php-src/branches/PHP_5_4/main/php.h
===
--- php/php-src/branches/PHP_5_4/main/php.h 2012-03-01 22:13:51 UTC (rev 
323736)
+++ php/php-src/branches/PHP_5_4/main/php.h 2012-03-01 22:34:23 UTC (rev 
323737)
@@ -61,14 +61,10 @@
 #  define PHPAPI
 #  endif

-#define THREAD_LS
-#define PHP_DIR_SEPARATOR '/'
-#if defined(__MacOSX__)
-#define PHP_EOL \r
-#else
-#define PHP_EOL \n
+#  define THREAD_LS
+#  define PHP_DIR_SEPARATOR '/'
+#  define PHP_EOL \n
 #endif
-#endif

 #ifdef NETWARE
 /* For php_get_uname() function */

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS main/main.c

[Rasmus Lerdorf]

rasmus   Thu, 01 Mar 2012 22:49:03 +

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

Log:
Merge: make max_file_uploads PHP_INI_SYSTEM|PHP_INI_PERDIR

Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/main/main.c

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-01 22:48:49 UTC (rev 323738)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-01 22:49:03 UTC (rev 323739)
@@ -4,6 +4,7 @@

 - Standard:
   . Fixed memory leak in substr_replace. (Pierrick)
+  . make max_file_uploads ini directive settable outside of php.ini (Rasmus)

 01 Mar 2012, PHP 5.4.0


Modified: php/php-src/branches/PHP_5_4/main/main.c
===
--- php/php-src/branches/PHP_5_4/main/main.c2012-03-01 22:48:49 UTC (rev 
323738)
+++ php/php-src/branches/PHP_5_4/main/main.c2012-03-01 22:49:03 UTC (rev 
323739)
@@ -552,7 +552,7 @@
PHP_INI_ENTRY(mail.force_extra_parameters,NULL,   
PHP_INI_SYSTEM|PHP_INI_PERDIR,  OnChangeMailForceExtra)
PHP_INI_ENTRY(disable_functions,  , 
PHP_INI_SYSTEM, NULL)
PHP_INI_ENTRY(disable_classes,, 
PHP_INI_SYSTEM, NULL)
-   PHP_INI_ENTRY(max_file_uploads,   20,   
PHP_INI_SYSTEM, NULL)
+   PHP_INI_ENTRY(max_file_uploads,   20,   
PHP_INI_SYSTEM|PHP_INI_PERDIR,  NULL)

STD_PHP_INI_BOOLEAN(allow_url_fopen,  1,
PHP_INI_SYSTEM, OnUpdateBool,   allow_url_fopen,
php_core_globals,   core_globals)
STD_PHP_INI_BOOLEAN(allow_url_include,0,
PHP_INI_SYSTEM, OnUpdateBool,   allow_url_include,  
php_core_globals,   core_globals)

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS sapi/cli/php_cli_server.c

[Rasmus Lerdorf]

rasmus   Fri, 02 Mar 2012 03:38:04 +

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

Log:
CLI Server was sending Connection: closed instead of Connection: close

Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-02 03:36:30 UTC (rev 323777)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-02 03:38:04 UTC (rev 323778)
@@ -2,6 +2,9 @@
 |||
 ?? ??? 2012, PHP 5.4.1 RC1

+- CLI Server:
+  . Connection: close instead of Connection: closed (Rasmus)
+
 - Core:
   . Fixed bug #61225 (Incorect lexing of 0b00*+NUM). (Pierrick)
   . Fixed bug #61165 (Segfault - strip_tags()). (Laruence)

Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
===
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c  2012-03-02 
03:36:30 UTC (rev 323777)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c  2012-03-02 
03:38:04 UTC (rev 323778)
@@ -351,7 +351,7 @@
smart_str_appendl_ex(buffer, \r\n, 2, persistent);
}
}
-   smart_str_appendl_ex(buffer, Connection: closed\r\n, 
sizeof(Connection: closed\r\n) - 1, persistent);
+   smart_str_appendl_ex(buffer, Connection: close\r\n, 
sizeof(Connection: close\r\n) - 1, persistent);
 } /* }}} */

 static const char *get_mime_type(const char *ext, size_t ext_len) /* {{{ */

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS

[Rasmus Lerdorf]

rasmus   Fri, 02 Mar 2012 03:40:08 +

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

Log:
Actually, this was a merge from trunk, and Gustavo did it originally.

Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-02 03:39:04 UTC (rev 323779)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-02 03:40:08 UTC (rev 323780)
@@ -3,7 +3,7 @@
 ?? ??? 2012, PHP 5.4.1 RC1

 - CLI Server:
-  . Connection: close instead of Connection: closed (Rasmus)
+  . Connection: close instead of Connection: closed (Gustavo)

 - Core:
   . Fixed bug #61225 (Incorect lexing of 0b00*+NUM). (Pierrick)

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/sapi/cli/tests/ php_cli_server_004.phpt php_cli_server_005.phpt php_cli_server_006.phpt php_cli_server_007.phpt php_cli_server_008.phpt php_cli_server_009.

[Rasmus Lerdorf]

rasmus   Fri, 02 Mar 2012 03:43:07 +

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

Log:
And fix the test cases as well

Changed paths:
U   php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_004.phpt
U   php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_005.phpt
U   php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_006.phpt
U   php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_007.phpt
U   php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_008.phpt
U   php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_009.phpt
U   php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_010.phpt
U   php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_012.phpt
U   php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_013.phpt
U   php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_014.phpt
U   php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_015.phpt

Modified: php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_004.phpt
===
--- php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_004.phpt 
2012-03-02 03:40:40 UTC (rev 323782)
+++ php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_004.phpt 
2012-03-02 03:43:07 UTC (rev 323783)
@@ -38,7 +38,7 @@
 --EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html


Modified: php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_005.phpt
===
--- php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_005.phpt 
2012-03-02 03:40:40 UTC (rev 323782)
+++ php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_005.phpt 
2012-03-02 03:43:07 UTC (rev 323783)
@@ -50,7 +50,7 @@
 --EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html


Modified: php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_006.phpt
===
--- php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_006.phpt 
2012-03-02 03:40:40 UTC (rev 323782)
+++ php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_006.phpt 
2012-03-02 03:43:07 UTC (rev 323783)
@@ -34,7 +34,7 @@
 --EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html


Modified: php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_007.phpt
===
--- php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_007.phpt 
2012-03-02 03:40:40 UTC (rev 323782)
+++ php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_007.phpt 
2012-03-02 03:43:07 UTC (rev 323783)
@@ -34,7 +34,7 @@
 --EXPECTF--
 HTTP/1.1 401 Unauthorized
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 WWW-Authenticate: Digest 
realm=foo,qop=auth,nonce=X,opaque=acbd18db4cc2f85cedef654fccc4a4d8
 Content-type: text/html

Modified: php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_008.phpt
===
--- php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_008.phpt 
2012-03-02 03:40:40 UTC (rev 323782)
+++ php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_008.phpt 
2012-03-02 03:43:07 UTC (rev 323783)
@@ -54,14 +54,14 @@
 --EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html

 string(8) HTTP/1.1
 HTTP/1.0 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html


Modified: php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_009.phpt
===
--- php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_009.phpt 
2012-03-02 03:40:40 UTC (rev 323782)
+++ php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_009.phpt 
2012-03-02 03:43:07 UTC (rev 323783)
@@ -78,14 +78,14 @@
 --EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html

 string(8) /foo/bar
 HTTP/1.0 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html


Modified: php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_010.phpt
===
--- php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_010.phpt 
2012-03-02 03:40:40 UTC (rev 323782)
+++ php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_010.phpt 
2012-03-02 03:43:07 UTC (rev 323783)
@@ -55,7 +55,7 @@
 --EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html

@@ 

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mbstring/tests/htmlent.phpt branches/PHP_5_4/ext/standard/tests/strings/htmlentities13.phpt branches/PHP_5_4/ext/standard/tests/strings/htmlentities14

[Rasmus Lerdorf]

rasmus   Fri, 02 Mar 2012 05:04:40 +

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

Log:
Fix tests that break if filter.default isn't set to unsafe_raw

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/mbstring/tests/htmlent.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities13.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities14.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/parse_str_basic3.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/022.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/023.phpt
U   php/php-src/trunk/ext/mbstring/tests/htmlent.phpt
U   php/php-src/trunk/ext/standard/tests/strings/htmlentities13.phpt
U   php/php-src/trunk/ext/standard/tests/strings/htmlentities14.phpt
U   php/php-src/trunk/ext/standard/tests/strings/parse_str_basic3.phpt
U   php/php-src/trunk/tests/basic/022.phpt
U   php/php-src/trunk/tests/basic/023.phpt

Modified: php/php-src/branches/PHP_5_4/ext/mbstring/tests/htmlent.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mbstring/tests/htmlent.phpt
2012-03-02 04:57:28 UTC (rev 323792)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/tests/htmlent.phpt
2012-03-02 05:04:40 UTC (rev 323793)
@@ -15,6 +15,7 @@
 mbstring.internal_encoding=UTF-8
 mbstring.http_output=HTML-ENTITIES
 mbstring.encoding_translation=1
+filter.default=unsafe_raw
 --FILE--
 ?php
 // enable output encoding through output handler

Modified: 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities13.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities13.phpt 
2012-03-02 04:57:28 UTC (rev 323792)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities13.phpt 
2012-03-02 05:04:40 UTC (rev 323793)
@@ -4,6 +4,7 @@
 output_handler=
 mbstring.internal_encoding=pass
 default_charset=EUC-JP
+filter.default=unsafe_raw
 --FILE--
 ?php
print ini_get('default_charset').\n;

Modified: 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities14.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities14.phpt 
2012-03-02 04:57:28 UTC (rev 323792)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities14.phpt 
2012-03-02 05:04:40 UTC (rev 323793)
@@ -4,6 +4,7 @@
 output_handler=
 mbstring.internal_encoding=pass
 default_charset=Shift_JIS
+filter.default=unsafe_raw
 --FILE--
 ?php
print ini_get('default_charset').\n;

Modified: 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/parse_str_basic3.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/parse_str_basic3.phpt   
2012-03-02 04:57:28 UTC (rev 323792)
+++ 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/parse_str_basic3.phpt   
2012-03-02 05:04:40 UTC (rev 323793)
@@ -2,6 +2,7 @@
 Test parse_str() function : basic functionality
 --INI--
 max_input_vars=1000
+filter.default=unsafe_raw
 --FILE--
 ?php
 /* Prototype  : void parse_str  ( string $str  [, array $arr  ] )

Modified: php/php-src/branches/PHP_5_4/tests/basic/022.phpt
===
--- php/php-src/branches/PHP_5_4/tests/basic/022.phpt   2012-03-02 04:57:28 UTC 
(rev 323792)
+++ php/php-src/branches/PHP_5_4/tests/basic/022.phpt   2012-03-02 05:04:40 UTC 
(rev 323793)
@@ -2,6 +2,7 @@
 Cookies test#1
 --INI--
 max_input_vars=1000
+filter.default=unsafe_raw
 --COOKIE--
 cookie1=val1  ; cookie2=val2%20; cookie3=val 3.; cookie 4= value 4 %3B; 
cookie1=bogus; %20cookie1=ignore;+cookie1=ignore;cookie1;cookie  5=%20 value; 
cookie%206=���;cookie+7=;$cookie.8;cookie-9=1;;;-  % $cookie 10=10
 --FILE--

Modified: php/php-src/branches/PHP_5_4/tests/basic/023.phpt
===
--- php/php-src/branches/PHP_5_4/tests/basic/023.phpt   2012-03-02 04:57:28 UTC 
(rev 323792)
+++ php/php-src/branches/PHP_5_4/tests/basic/023.phpt   2012-03-02 05:04:40 UTC 
(rev 323793)
@@ -2,6 +2,7 @@
 Cookies test#2
 --INI--
 max_input_vars=1000
+filter.default=unsafe_raw
 --COOKIE--
 c o o k i e=value; c o o k i e= v a l u e ;;c%20o+o 
k+i%20e=v;name=value,value,UEhQIQ==;UEhQIQ==foo
 --FILE--

Modified: php/php-src/trunk/ext/mbstring/tests/htmlent.phpt
===
--- php/php-src/trunk/ext/mbstring/tests/htmlent.phpt   2012-03-02 04:57:28 UTC 
(rev 323792)
+++ php/php-src/trunk/ext/mbstring/tests/htmlent.phpt   2012-03-02 05:04:40 UTC 
(rev 323793)
@@ -15,6 +15,7 @@
 mbstring.internal_encoding=UTF-8
 mbstring.http_output=HTML-ENTITIES
 mbstring.encoding_translation=1

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/main/php.h trunk/main/php.h

[Rasmus Lerdorf]

rasmus   Mon, 27 Feb 2012 12:16:39 +

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

Log:
Fix bug 61193

Bug: https://bugs.php.net/61193 (Open) PHP_EOL definition for Mac OS X is wrong 
and unused
  
Changed paths:
U   php/php-src/branches/PHP_5_3/main/php.h
U   php/php-src/trunk/main/php.h

Modified: php/php-src/branches/PHP_5_3/main/php.h
===
--- php/php-src/branches/PHP_5_3/main/php.h 2012-02-27 11:30:03 UTC (rev 
323576)
+++ php/php-src/branches/PHP_5_3/main/php.h 2012-02-27 12:16:39 UTC (rev 
323577)
@@ -60,15 +60,10 @@
 #  else
 #  define PHPAPI
 #  endif
-
-#define THREAD_LS
-#define PHP_DIR_SEPARATOR '/'
-#if defined(__MacOSX__)
-#define PHP_EOL \r
-#else
-#define PHP_EOL \n
+#  define THREAD_LS
+#  define PHP_DIR_SEPARATOR '/'
+#  define PHP_EOL \n
 #endif
-#endif

 #ifdef NETWARE
 /* For php_get_uname() function */

Modified: php/php-src/trunk/main/php.h
===
--- php/php-src/trunk/main/php.h2012-02-27 11:30:03 UTC (rev 323576)
+++ php/php-src/trunk/main/php.h2012-02-27 12:16:39 UTC (rev 323577)
@@ -60,15 +60,10 @@
 #  else
 #  define PHPAPI
 #  endif
-
-#define THREAD_LS
-#define PHP_DIR_SEPARATOR '/'
-#if defined(__MacOSX__)
-#define PHP_EOL \r
-#else
-#define PHP_EOL \n
+#  define THREAD_LS
+#  define PHP_DIR_SEPARATOR '/'
+#  define PHP_EOL \n
 #endif
-#endif

 #ifdef NETWARE
 /* For php_get_uname() function */

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

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/standard/tests/streams/ bug47997.phpt

[Rasmus Lerdorf]

On 02/25/2012 10:58 AM, Olivier DOUCET wrote:
 Changed paths:
 U   php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug47997.phpt

What about trunk and 5_3 for this one?

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

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/standard/tests/streams/ bug47997.phpt

[Rasmus Lerdorf]

On 02/25/2012 12:25 PM, Olivier Doucet wrote:
 Hi,
 
 Le 25/02/2012 13:13, Rasmus Lerdorf a écrit :
 What about trunk and 5_3 for this one? 
 Test is working without patch in 5.3 and trunk (tested with source
 snapshot a few hours ago).
 So fopen('data://') seems to require allow_url_fopen since 5.4, or
 default value in tests has changed.

That seems suspicious. Are you sure you are using the same php.ini for
all three?

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/fpm/ php-fpm.conf.in

[Rasmus Lerdorf]

rasmus   Mon, 20 Feb 2012 20:29:26 +

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

Log:
Fix bug 61149

Bug: https://bugs.php.net/61149 (Open) access.format directive should be in 
quotation marks
  
Changed paths:
U   php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in
===
--- php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in   2012-02-20 
18:28:57 UTC (rev 323394)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in   2012-02-20 
20:29:26 UTC (rev 323395)
@@ -399,7 +399,7 @@
 ;  %u: remote user
 ;
 ; Default: %R - %u %t \%m %r\ %s
-;access.format = %R - %u %t %m %r%Q%q %s %f %{mili}d %{kilo}M %C%%
+;access.format = %R - %u %t %m %r%Q%q %s %f %{mili}d %{kilo}M %C%%

 ; The log file for slow requests
 ; Default Value: not set

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/fpm/ php-fpm.conf.in

[Rasmus Lerdorf]

rasmus   Tue, 21 Feb 2012 00:01:19 +

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

Log:
Yup, these need to be escaped. Good catch.

Changed paths:
U   php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in
===
--- php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in   2012-02-20 
20:29:26 UTC (rev 323395)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in   2012-02-21 
00:01:19 UTC (rev 323396)
@@ -399,7 +399,7 @@
 ;  %u: remote user
 ;
 ; Default: %R - %u %t \%m %r\ %s
-;access.format = %R - %u %t %m %r%Q%q %s %f %{mili}d %{kilo}M %C%%
+;access.format = %R - %u %t \%m %r%Q%q\ %s %f %{mili}d %{kilo}M %C%%

 ; The log file for slow requests
 ; Default Value: not set

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Fri, 17 Feb 2012 17:02:50 +

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

Log:
Karma for Nikita

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-02-17 15:51:31 UTC (rev 323292)
+++ SVNROOT/global_avail2012-02-17 17:02:50 UTC (rev 323293)
@@ -22,7 +22,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP, as well as the documentation.

-avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,!
 
tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad|php/php-src,pecl,phpdoc,phd,web/doc.git,web/doc-editor.git
+avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,!
 
tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,nikic|php/php-src,pecl,phpdoc,phd,web/doc.git,web/doc-editor.git

 # Engine karma is further restricted (this line MUST come after lines granting
 # php-src karma and before lines granting Zend/TSRM karma)

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

[PHP-CVS] svn: /php/php-src/trunk/main/ main.c

[Rasmus Lerdorf]

rasmus   Fri, 17 Feb 2012 17:54:11 +

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

Log:
I think we should let this be settable from .htaccess to match the other 
post/upload
related limits like upload_max_filesize, post_max_size, and max_input_vars.

Changed paths:
U   php/php-src/trunk/main/main.c

Modified: php/php-src/trunk/main/main.c
===
--- php/php-src/trunk/main/main.c   2012-02-17 17:45:36 UTC (rev 323295)
+++ php/php-src/trunk/main/main.c   2012-02-17 17:54:11 UTC (rev 323296)
@@ -552,7 +552,7 @@
PHP_INI_ENTRY(mail.force_extra_parameters,NULL,   
PHP_INI_SYSTEM|PHP_INI_PERDIR,  OnChangeMailForceExtra)
PHP_INI_ENTRY(disable_functions,  , 
PHP_INI_SYSTEM, NULL)
PHP_INI_ENTRY(disable_classes,, 
PHP_INI_SYSTEM, NULL)
-   PHP_INI_ENTRY(max_file_uploads,   20,   
PHP_INI_SYSTEM, NULL)
+   PHP_INI_ENTRY(max_file_uploads,   20,   
PHP_INI_SYSTEM|PHP_INI_PERDIR,  NULL)

STD_PHP_INI_BOOLEAN(allow_url_fopen,  1,
PHP_INI_SYSTEM, OnUpdateBool,   allow_url_fopen,
php_core_globals,   core_globals)
STD_PHP_INI_BOOLEAN(allow_url_include,0,
PHP_INI_SYSTEM, OnUpdateBool,   allow_url_include,  
php_core_globals,   core_globals)

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Rasmus Lerdorf]

rasmus   Fri, 17 Feb 2012 19:07:17 +

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

Log:
Karma for Rahul Priyadarshi

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-02-17 18:30:51 UTC (rev 323299)
+++ SVNROOT/global_avail2012-02-17 19:07:17 UTC (rev 323300)
@@ -367,10 +367,10 @@
 # please contact the lead developers.  This is a temporary measure until
 # we can put in place a more general process.
 
unavail||pecl/ibm_db2,pecl/sdo,pecl/pdo_ids,pecl/pdo_informix,pecl/pdo_ibm,pecl/sam
-avail|dbs,skoduru,kraman,rs,kfbombar,tessus,ambrish|pecl/ibm_db2,pecl/pdo_ibm
+avail|dbs,skoduru,kraman,rs,kfbombar,tessus,ambrish,rahulpriyadarshi|pecl/ibm_db2,pecl/pdo_ibm
 avail|wez,dbs|php/php-src/*/ext/pdo_odbc
 avail|gcc,cem,mfp,ansriniv,slaws,chm,rs|pecl/sdo
-avail|dbs,kraman,kfbombar,ambrish|pecl/pdo_ids,pecl/pdo_informix,pecl/pdo_ibm
+avail|dbs,kraman,kfbombar,ambrish,rahulpriyadarshi|pecl/pdo_ids,pecl/pdo_informix,pecl/pdo_ibm

 # preprocessor karma
 avail|merlin|pecl/preprocessor

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/tests/basic/bug61000.phpt trunk/tests/basic/bug61000.phpt

[Rasmus Lerdorf]

rasmus   Thu, 16 Feb 2012 17:48:30 +

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

Log:
Weird, what happened here?

Changed paths:
U   php/php-src/branches/PHP_5_3/tests/basic/bug61000.phpt
U   php/php-src/trunk/tests/basic/bug61000.phpt

Modified: php/php-src/branches/PHP_5_3/tests/basic/bug61000.phpt
===
--- php/php-src/branches/PHP_5_3/tests/basic/bug61000.phpt  2012-02-16 
16:43:04 UTC (rev 323257)
+++ php/php-src/branches/PHP_5_3/tests/basic/bug61000.phpt  2012-02-16 
17:48:30 UTC (rev 323258)
@@ -17,22 +17,3 @@
 Array
 (
 )
---TEST--
-Bug #61000 (Exceeding max nesting level doesn't delete numerical vars)
---INI--
-max_input_nesting_level=2
---POST--
-1[a][]=foo1[a][b][c]=bar
---GET--
-a[a][]=fooa[a][b][c]=bar
---FILE--
-?php
-print_r($_GET);
-print_r($_POST);
---EXPECTF--
-Array
-(
-)
-Array
-(
-)

Modified: php/php-src/trunk/tests/basic/bug61000.phpt
===
--- php/php-src/trunk/tests/basic/bug61000.phpt 2012-02-16 16:43:04 UTC (rev 
323257)
+++ php/php-src/trunk/tests/basic/bug61000.phpt 2012-02-16 17:48:30 UTC (rev 
323258)
@@ -17,22 +17,3 @@
 Array
 (
 )
---TEST--
-Bug #61000 (Exceeding max nesting level doesn't delete numerical vars)
---INI--
-max_input_nesting_level=2
---POST--
-1[a][]=foo1[a][b][c]=bar
---GET--
-a[a][]=fooa[a][b][c]=bar
---FILE--
-?php
-print_r($_GET);
-print_r($_POST);
---EXPECTF--
-Array
-(
-)
-Array
-(
-)

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

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/Zend/Zend.m4 branches/PHP_5_4/Zend/zend.h branches/PHP_5_4/main/main.c trunk/Zend/Zend.m4 trunk/Zend/zend.h trunk/main/main.c

[Rasmus Lerdorf]

On 02/15/2012 05:51 PM, Stanislav Malyshev wrote:
 stas Thu, 16 Feb 2012 01:51:45 +
 
 Revision: http://svn.php.net/viewvc?view=revisionrevision=323245
 
 Log:
 make ZEND_SIGNALS configurable, off by default
 also make ZEND_SIGNALS enabled and disabled binary-compatible
 
 Changed paths:
 U   php/php-src/branches/PHP_5_4/NEWS
 U   php/php-src/branches/PHP_5_4/Zend/Zend.m4
 U   php/php-src/branches/PHP_5_4/Zend/zend.h
 U   php/php-src/branches/PHP_5_4/main/main.c
 U   php/php-src/trunk/Zend/Zend.m4
 U   php/php-src/trunk/Zend/zend.h
 U   php/php-src/trunk/main/main.c

Did you run the tests? Just from a quick skim I think this would break
both the pcntl and the posix extension.

-Rasmus

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

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/Zend/Zend.m4 branches/PHP_5_4/Zend/zend.h branches/PHP_5_4/main/main.c trunk/Zend/Zend.m4 trunk/Zend/zend.h trunk/main/main.c

[Rasmus Lerdorf]

On 02/15/2012 08:52 PM, Rasmus Lerdorf wrote:
 On 02/15/2012 05:51 PM, Stanislav Malyshev wrote:
 stas Thu, 16 Feb 2012 01:51:45 +

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

 Log:
 make ZEND_SIGNALS configurable, off by default
 also make ZEND_SIGNALS enabled and disabled binary-compatible

 Changed paths:
 U   php/php-src/branches/PHP_5_4/NEWS
 U   php/php-src/branches/PHP_5_4/Zend/Zend.m4
 U   php/php-src/branches/PHP_5_4/Zend/zend.h
 U   php/php-src/branches/PHP_5_4/main/main.c
 U   php/php-src/trunk/Zend/Zend.m4
 U   php/php-src/trunk/Zend/zend.h
 U   php/php-src/trunk/main/main.c
 
 Did you run the tests? Just from a quick skim I think this would break
 both the pcntl and the posix extension.

ok, the pcntl test failures were due to the API bump and not having
recompiled shared extensions that rely on zend_signals

posix seems ok

-Rasmus

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/tests/basic/022.phpt branches/PHP_5_3/tests/basic/023.phpt branches/PHP_5_3/tests/basic/024.phpt branches/PHP_5_3/tests/basic/027.phpt branches/PHP_5_3/te

[Rasmus Lerdorf]

rasmus   Tue, 14 Feb 2012 09:47:32 +

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

Log:
These tests fail unless max_input_vars and/or max_file_uploads is set high 
enough

Changed paths:
U   php/php-src/branches/PHP_5_3/tests/basic/022.phpt
U   php/php-src/branches/PHP_5_3/tests/basic/023.phpt
U   php/php-src/branches/PHP_5_3/tests/basic/024.phpt
U   php/php-src/branches/PHP_5_3/tests/basic/027.phpt
U   php/php-src/branches/PHP_5_3/tests/basic/rfc1867_anonymous_upload.phpt
U   php/php-src/branches/PHP_5_3/tests/basic/rfc1867_array_upload.phpt
U   php/php-src/branches/PHP_5_3/tests/basic/rfc1867_empty_upload.phpt
U   php/php-src/branches/PHP_5_3/tests/basic/rfc1867_max_file_size.phpt
U   php/php-src/branches/PHP_5_3/tests/basic/rfc1867_post_max_filesize.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/022.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/023.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/024.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/027.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/028.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/bug55500.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/rfc1867_anonymous_upload.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/rfc1867_array_upload.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/rfc1867_empty_upload.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/rfc1867_max_file_size.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/rfc1867_post_max_filesize.phpt
U   php/php-src/trunk/tests/basic/022.phpt
U   php/php-src/trunk/tests/basic/023.phpt
U   php/php-src/trunk/tests/basic/024.phpt
U   php/php-src/trunk/tests/basic/027.phpt
U   php/php-src/trunk/tests/basic/028.phpt
U   php/php-src/trunk/tests/basic/bug55500.phpt
U   php/php-src/trunk/tests/basic/rfc1867_anonymous_upload.phpt
U   php/php-src/trunk/tests/basic/rfc1867_array_upload.phpt
U   php/php-src/trunk/tests/basic/rfc1867_empty_upload.phpt
U   php/php-src/trunk/tests/basic/rfc1867_max_file_size.phpt
U   php/php-src/trunk/tests/basic/rfc1867_post_max_filesize.phpt

Modified: php/php-src/branches/PHP_5_3/tests/basic/022.phpt
===
--- php/php-src/branches/PHP_5_3/tests/basic/022.phpt	2012-02-14 09:27:08 UTC (rev 323204)
+++ php/php-src/branches/PHP_5_3/tests/basic/022.phpt	2012-02-14 09:47:32 UTC (rev 323205)
@@ -1,5 +1,7 @@
 --TEST--
 Cookies test#1
+--INI--
+max_input_vars=1000
 --COOKIE--
 cookie1=val1  ; cookie2=val2%20; cookie3=val 3.; cookie 4= value 4 %3B; cookie1=bogus; %20cookie1=ignore;+cookie1=ignore;cookie1;cookie  5=%20 value; cookie%206=þæö;cookie+7=;$cookie.8;cookie-9=1;;;-  % $cookie 10=10
 --FILE--

Modified: php/php-src/branches/PHP_5_3/tests/basic/023.phpt
===
--- php/php-src/branches/PHP_5_3/tests/basic/023.phpt	2012-02-14 09:27:08 UTC (rev 323204)
+++ php/php-src/branches/PHP_5_3/tests/basic/023.phpt	2012-02-14 09:47:32 UTC (rev 323205)
@@ -2,6 +2,7 @@
 Cookies test#2
 --INI--
 magic_quotes_gpc=0
+max_input_vars=1000
 --COOKIE--
 c o o k i e=value; c o o k i e= v a l u e ;;c%20o+o k+i%20e=v;name=value,value,UEhQIQ==;UEhQIQ==foo
 --FILE--

Modified: php/php-src/branches/PHP_5_3/tests/basic/024.phpt
===
--- php/php-src/branches/PHP_5_3/tests/basic/024.phpt	2012-02-14 09:27:08 UTC (rev 323204)
+++ php/php-src/branches/PHP_5_3/tests/basic/024.phpt	2012-02-14 09:47:32 UTC (rev 323205)
@@ -3,6 +3,7 @@
 --INI--
 magic_quotes_gpc=0
 always_populate_raw_post_data=1
+max_input_vars=1000
 --POST--
 a=ABCy=XYZc[]=1c[]=2c[a]=3
 --FILE--

Modified: php/php-src/branches/PHP_5_3/tests/basic/027.phpt
===
--- php/php-src/branches/PHP_5_3/tests/basic/027.phpt	2012-02-14 09:27:08 UTC (rev 323204)
+++ php/php-src/branches/PHP_5_3/tests/basic/027.phpt	2012-02-14 09:47:32 UTC (rev 323205)
@@ -5,6 +5,7 @@
 always_populate_raw_post_data=0
 display_errors=0
 max_input_nesting_level=10
+max_input_vars=1000
 track_errors=1
 log_errors=0
 --POST--

Modified: php/php-src/branches/PHP_5_3/tests/basic/rfc1867_anonymous_upload.phpt
===
--- php/php-src/branches/PHP_5_3/tests/basic/rfc1867_anonymous_upload.phpt	2012-02-14 09:27:08 UTC (rev 323204)
+++ php/php-src/branches/PHP_5_3/tests/basic/rfc1867_anonymous_upload.phpt	2012-02-14 09:47:32 UTC (rev 323205)
@@ -5,6 +5,7 @@
 error_reporting=E_ALL~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
+max_file_uploads=10
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---20896060251896012921717172737
 -20896060251896012921717172737

Modified: 

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt branches/PHP_5_4/ext/standard/tests/strings/parse_str_basic3.phpt trunk/ext/standard/tests/strings/parse_

[Rasmus Lerdorf]

rasmus   Tue, 14 Feb 2012 09:50:46 +

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

Log:
This one depends on max_input_vars as well

Changed paths:
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/parse_str_basic3.phpt
U   php/php-src/trunk/ext/standard/tests/strings/parse_str_basic3.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt   
2012-02-14 09:47:32 UTC (rev 323205)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt   
2012-02-14 09:50:46 UTC (rev 323206)
@@ -2,6 +2,7 @@
 Test parse_str() function : basic functionality
 --INI--
 magic_quotes_gpc = on
+max_input_vars=1000
 --FILE--
 ?php
 /* Prototype  : void parse_str  ( string $str  [, array $arr  ] )

Modified: 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/parse_str_basic3.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/parse_str_basic3.phpt   
2012-02-14 09:47:32 UTC (rev 323205)
+++ 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/parse_str_basic3.phpt   
2012-02-14 09:50:46 UTC (rev 323206)
@@ -1,5 +1,7 @@
 --TEST--
 Test parse_str() function : basic functionality
+--INI--
+max_input_vars=1000
 --FILE--
 ?php
 /* Prototype  : void parse_str  ( string $str  [, array $arr  ] )

Modified: php/php-src/trunk/ext/standard/tests/strings/parse_str_basic3.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/parse_str_basic3.phpt  
2012-02-14 09:47:32 UTC (rev 323205)
+++ php/php-src/trunk/ext/standard/tests/strings/parse_str_basic3.phpt  
2012-02-14 09:50:46 UTC (rev 323206)
@@ -1,5 +1,7 @@
 --TEST--
 Test parse_str() function : basic functionality
+--INI--
+max_input_vars=100
 --FILE--
 ?php
 /* Prototype  : void parse_str  ( string $str  [, array $arr  ] )

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/array/ arsort_variation5.phpt krsort_variation5.phpt ksort_variation5.phpt sort_variation5.phpt

[Rasmus Lerdorf]

rasmus   Sun, 12 Feb 2012 08:01:25 +

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

Log:
Unbreak these tests - please be careful with your Windows-based editors that
seem to mess up ^M's here.

Changed paths:
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/array/arsort_variation5.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/array/krsort_variation5.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/array/ksort_variation5.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/array/sort_variation5.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/array/arsort_variation5.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/array/arsort_variation5.phpt
2012-02-12 05:32:24 UTC (rev 323161)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/array/arsort_variation5.phpt
2012-02-12 08:01:25 UTC (rev 323162)
@@ -81,9 +81,9 @@
   string(3) \cx
   [\a]=
   string(2) \a
-  [
+  [
 ]=
-  string(1) 
+  string(1) 
 
   []=
   string(1) 
@@ -113,9 +113,9 @@
   string(3) \cx
   [\a]=
   string(2) \a
-  [
+  [
 ]=
-  string(1) 
+  string(1) 
 
   []=
   string(1) 
@@ -145,9 +145,9 @@
   string(3) \cx
   [\a]=
   string(2) \a
-  [
+  [
 ]=
-  string(1) 
+  string(1) 
 
   []=
   string(1) 
@@ -250,4 +250,4 @@
   [B]=
   string(6) BANANA
 }
-Done
\ No newline at end of file
+Done

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/array/krsort_variation5.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/array/krsort_variation5.phpt
2012-02-12 05:32:24 UTC (rev 323161)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/array/krsort_variation5.phpt
2012-02-12 08:01:25 UTC (rev 323162)
@@ -81,9 +81,9 @@
   string(3) \cx
   [\a]=
   string(2) \a
-  [
+  [
 ]=
-  string(1) 
+  string(1) 
 
   []=
   string(1) 
@@ -111,9 +111,9 @@
   string(3) \cx
   [\a]=
   string(2) \a
-  [
+  [
 ]=
-  string(1) 
+  string(1) 
 
   []=
   string(1) 
@@ -141,9 +141,9 @@
   string(3) \cx
   [\a]=
   string(2) \a
-  [
+  [
 ]=
-  string(1) 
+  string(1) 
 
   []=
   string(1) 

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/array/ksort_variation5.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/array/ksort_variation5.phpt 
2012-02-12 05:32:24 UTC (rev 323161)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/array/ksort_variation5.phpt 
2012-02-12 08:01:25 UTC (rev 323162)
@@ -83,9 +83,9 @@
   string(1) 
   []=
   string(1) 
-  [
+  [
 ]=
-  string(1) 
+  string(1) 
 
   [\a]=
   string(2) \a
@@ -113,9 +113,9 @@
   string(1) 
   []=
   string(1) 
-  [
+  [
 ]=
-  string(1) 
+  string(1) 
 
   [\a]=
   string(2) \a
@@ -143,9 +143,9 @@
   string(1) 
   []=
   string(1) 
-  [
+  [
 ]=
-  string(1) 
+  string(1) 
 
   [\a]=
   string(2) \a

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/array/sort_variation5.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/array/sort_variation5.phpt  
2012-02-12 05:32:24 UTC (rev 323161)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/array/sort_variation5.phpt  
2012-02-12 08:01:25 UTC (rev 323162)
@@ -79,7 +79,7 @@
   [5]=
   string(1) 
   [6]=
-  string(1) 
+  string(1) 
 
   [7]=
   string(2) \a
@@ -109,7 +109,7 @@
   [5]=
   string(1) 
   [6]=
-  string(1) 
+  string(1) 
 
   [7]=
   string(2) \a
@@ -139,7 +139,7 @@
   [5]=
   string(1) 
   [6]=
-  string(1) 
+  string(1) 
 
   [7]=
   string(2) \a

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/php_pcre.c branches/PHP_5_3/ext/pcre/php_pcre.def branches/PHP_5_3/main/php_compat.h branches/PHP_5_4/ext/pcre/php_pcre.c branches/PHP_5_4/ext/pc

[Rasmus Lerdorf]

rasmus   Mon, 06 Feb 2012 18:11:56 +

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

Log:
Fix for bug 60986

Bug: https://bugs.php.net/60986 (Critical) pcre_get_compiled_regex_cache: 
php_pcre.c: undefined reference to 'pcre_info'
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c
U   php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.def
U   php/php-src/branches/PHP_5_3/main/php_compat.h
U   php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c
U   php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.def
U   php/php-src/branches/PHP_5_4/main/php_compat.h
U   php/php-src/trunk/ext/pcre/php_pcre.c
U   php/php-src/trunk/ext/pcre/php_pcre.def
U   php/php-src/trunk/main/php_compat.h

Modified: php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c
===
--- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c2012-02-06 17:57:47 UTC 
(rev 323095)
+++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c2012-02-06 18:11:56 UTC 
(rev 323096)
@@ -252,10 +252,10 @@
   back the compiled pattern, otherwise go on and compile it. */
if (zend_hash_find(PCRE_G(pcre_cache), regex, regex_len+1, (void 
**)pce) == SUCCESS) {
/*
-* We use a quick pcre_info() check to see whether cache is 
corrupted, and if it
+* We use a quick pcre_fullinfo() check to see whether cache is 
corrupted, and if it
 * is, we flush it and compile the pattern from scratch.
 */
-   if (pcre_info(pce-re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
+   if (pcre_fullinfo(pce-re, NULL, NULL, NULL) == 
PCRE_ERROR_BADMAGIC) {
zend_hash_clean(PCRE_G(pcre_cache));
} else {
 #if HAVE_SETLOCALE

Modified: php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.def
===
--- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.def  2012-02-06 17:57:47 UTC 
(rev 323095)
+++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.def  2012-02-06 18:11:56 UTC 
(rev 323096)
@@ -4,7 +4,6 @@
 php_pcre_exec
 php_pcre_get_substring
 php_pcre_get_substring_list
-php_pcre_info
 php_pcre_maketables
 php_pcre_study
 php_pcre_version

Modified: php/php-src/branches/PHP_5_3/main/php_compat.h
===
--- php/php-src/branches/PHP_5_3/main/php_compat.h  2012-02-06 17:57:47 UTC 
(rev 323095)
+++ php/php-src/branches/PHP_5_3/main/php_compat.h  2012-02-06 18:11:56 UTC 
(rev 323096)
@@ -34,7 +34,6 @@
 #define pcre_exec  php_pcre_exec
 #define pcre_get_substring php_pcre_get_substring
 #define pcre_get_substring_listphp_pcre_get_substring_list
-#define pcre_info  php_pcre_info
 #define pcre_maketablesphp_pcre_maketables
 #define pcre_study php_pcre_study
 #define pcre_version   php_pcre_version

Modified: php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c
===
--- php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c2012-02-06 17:57:47 UTC 
(rev 323095)
+++ php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c2012-02-06 18:11:56 UTC 
(rev 323096)
@@ -252,10 +252,10 @@
   back the compiled pattern, otherwise go on and compile it. */
if (zend_hash_find(PCRE_G(pcre_cache), regex, regex_len+1, (void 
**)pce) == SUCCESS) {
/*
-* We use a quick pcre_info() check to see whether cache is 
corrupted, and if it
+* We use a quick pcre_fullinfo() check to see whether cache is 
corrupted, and if it
 * is, we flush it and compile the pattern from scratch.
 */
-   if (pcre_info(pce-re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
+   if (pcre_fullinfo(pce-re, NULL, NULL, NULL) == 
PCRE_ERROR_BADMAGIC) {
zend_hash_clean(PCRE_G(pcre_cache));
} else {
 #if HAVE_SETLOCALE

Modified: php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.def
===
--- php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.def  2012-02-06 17:57:47 UTC 
(rev 323095)
+++ php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.def  2012-02-06 18:11:56 UTC 
(rev 323096)
@@ -4,7 +4,6 @@
 php_pcre_exec
 php_pcre_get_substring
 php_pcre_get_substring_list
-php_pcre_info
 php_pcre_maketables
 php_pcre_study
 php_pcre_version

Modified: php/php-src/branches/PHP_5_4/main/php_compat.h
===
--- php/php-src/branches/PHP_5_4/main/php_compat.h  2012-02-06 17:57:47 UTC 
(rev 323095)
+++ php/php-src/branches/PHP_5_4/main/php_compat.h  2012-02-06 18:11:56 UTC 
(rev 323096)
@@ -34,7 +34,6 @@

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/php_pcre.c branches/PHP_5_4/ext/pcre/php_pcre.c trunk/ext/pcre/php_pcre.c

[Rasmus Lerdorf]

rasmus   Mon, 06 Feb 2012 18:18:53 +

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

Log:
Safer way to call pcre_fullinfo - bug 60986

Bug: https://bugs.php.net/60986 (Critical) pcre_get_compiled_regex_cache: 
php_pcre.c: undefined reference to 'pcre_info'
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c
U   php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c
U   php/php-src/trunk/ext/pcre/php_pcre.c

Modified: php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c
===
--- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c2012-02-06 18:11:56 UTC 
(rev 323096)
+++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c2012-02-06 18:18:53 UTC 
(rev 323097)
@@ -241,6 +241,7 @@
char*pattern;
int  do_study = 0;
int  poptions = 0;
+   int count = 0;
unsigned const char *tables = NULL;
 #if HAVE_SETLOCALE
char*locale = setlocale(LC_CTYPE, NULL);
@@ -255,7 +256,7 @@
 * We use a quick pcre_fullinfo() check to see whether cache is 
corrupted, and if it
 * is, we flush it and compile the pattern from scratch.
 */
-   if (pcre_fullinfo(pce-re, NULL, NULL, NULL) == 
PCRE_ERROR_BADMAGIC) {
+   if (pcre_fullinfo(pce-re, NULL, PCRE_INFO_CAPTURECOUNT, 
count) == PCRE_ERROR_BADMAGIC) {
zend_hash_clean(PCRE_G(pcre_cache));
} else {
 #if HAVE_SETLOCALE

Modified: php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c
===
--- php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c2012-02-06 18:11:56 UTC 
(rev 323096)
+++ php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c2012-02-06 18:18:53 UTC 
(rev 323097)
@@ -241,6 +241,7 @@
char*pattern;
int  do_study = 0;
int  poptions = 0;
+   int count = 0;
unsigned const char *tables = NULL;
 #if HAVE_SETLOCALE
char*locale = setlocale(LC_CTYPE, NULL);
@@ -255,7 +256,7 @@
 * We use a quick pcre_fullinfo() check to see whether cache is 
corrupted, and if it
 * is, we flush it and compile the pattern from scratch.
 */
-   if (pcre_fullinfo(pce-re, NULL, NULL, NULL) == 
PCRE_ERROR_BADMAGIC) {
+   if (pcre_fullinfo(pce-re, NULL, PCRE_INFO_CAPTURECOUNT, 
count) == PCRE_ERROR_BADMAGIC) {
zend_hash_clean(PCRE_G(pcre_cache));
} else {
 #if HAVE_SETLOCALE

Modified: php/php-src/trunk/ext/pcre/php_pcre.c
===
--- php/php-src/trunk/ext/pcre/php_pcre.c   2012-02-06 18:11:56 UTC (rev 
323096)
+++ php/php-src/trunk/ext/pcre/php_pcre.c   2012-02-06 18:18:53 UTC (rev 
323097)
@@ -241,6 +241,7 @@
char*pattern;
int  do_study = 0;
int  poptions = 0;
+   int count = 0;
unsigned const char *tables = NULL;
 #if HAVE_SETLOCALE
char*locale = setlocale(LC_CTYPE, NULL);
@@ -255,7 +256,7 @@
 * We use a quick pcre_fullinfo() check to see whether cache is 
corrupted, and if it
 * is, we flush it and compile the pattern from scratch.
 */
-   if (pcre_fullinfo(pce-re, NULL, NULL, NULL) == 
PCRE_ERROR_BADMAGIC) {
+   if (pcre_fullinfo(pce-re, NULL, PCRE_INFO_CAPTURECOUNT, 
count) == PCRE_ERROR_BADMAGIC) {
zend_hash_clean(PCRE_G(pcre_cache));
} else {
 #if HAVE_SETLOCALE

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/openssl/tests/bug28382.phpt branches/PHP_5_4/ext/openssl/tests/bug28382.phpt trunk/ext/openssl/tests/bug28382.phpt

[Rasmus Lerdorf]

rasmus   Sun, 05 Feb 2012 09:32:20 +

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

Log:
According to the reports on qa this test is failing the same way for everyone.
See: 
http://qa.php.net/reports/viewreports.php?version=5.3.10test=%2Fext%2Fopenssl%2Ftests%2Fbug28382.phpt
I'm not sure if this is due to a change in the openssl library or in the 
extension, so perhaps the test
itself needs to change, but for now synch it with the new output and watch for 
failures.

Bug: https://bugs.php.net/28382 (Closed) the openssl_x509_parse function does 
not extract the certificate extensions
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/openssl/tests/bug28382.phpt
U   php/php-src/branches/PHP_5_4/ext/openssl/tests/bug28382.phpt
U   php/php-src/trunk/ext/openssl/tests/bug28382.phpt

Modified: php/php-src/branches/PHP_5_3/ext/openssl/tests/bug28382.phpt
===
--- php/php-src/branches/PHP_5_3/ext/openssl/tests/bug28382.phpt
2012-02-05 07:47:43 UTC (rev 323069)
+++ php/php-src/branches/PHP_5_3/ext/openssl/tests/bug28382.phpt
2012-02-05 09:32:20 UTC (rev 323070)
@@ -20,7 +20,9 @@
   [nsCertType]=
   string(30) SSL Client, SSL Server, S/MIME
   [crlDistributionPoints]=
-  string(51) URI:http://mobile.blue-software.ro:90/ca/crl.shtml
+  string(65) 
+Full Name:
+  URI:http://mobile.blue-software.ro:90/ca/crl.shtml
 
   [nsCaPolicyUrl]=
   string(38) http://mobile.blue-software.ro:90/pub/;

Modified: php/php-src/branches/PHP_5_4/ext/openssl/tests/bug28382.phpt
===
--- php/php-src/branches/PHP_5_4/ext/openssl/tests/bug28382.phpt
2012-02-05 07:47:43 UTC (rev 323069)
+++ php/php-src/branches/PHP_5_4/ext/openssl/tests/bug28382.phpt
2012-02-05 09:32:20 UTC (rev 323070)
@@ -20,7 +20,9 @@
   [nsCertType]=
   string(30) SSL Client, SSL Server, S/MIME
   [crlDistributionPoints]=
-  string(51) URI:http://mobile.blue-software.ro:90/ca/crl.shtml
+  string(65) 
+Full Name:
+  URI:http://mobile.blue-software.ro:90/ca/crl.shtml
 
   [nsCaPolicyUrl]=
   string(38) http://mobile.blue-software.ro:90/pub/;

Modified: php/php-src/trunk/ext/openssl/tests/bug28382.phpt
===
--- php/php-src/trunk/ext/openssl/tests/bug28382.phpt   2012-02-05 07:47:43 UTC 
(rev 323069)
+++ php/php-src/trunk/ext/openssl/tests/bug28382.phpt   2012-02-05 09:32:20 UTC 
(rev 323070)
@@ -20,7 +20,9 @@
   [nsCertType]=
   string(30) SSL Client, SSL Server, S/MIME
   [crlDistributionPoints]=
-  string(51) URI:http://mobile.blue-software.ro:90/ca/crl.shtml
+  string(65) 
+Full Name:
+  URI:http://mobile.blue-software.ro:90/ca/crl.shtml
 
   [nsCaPolicyUrl]=
   string(38) http://mobile.blue-software.ro:90/pub/;

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/openssl/tests/bug47828.phpt branches/PHP_5_4/ext/openssl/tests/bug47828.phpt trunk/ext/openssl/tests/bug47828.phpt

[Rasmus Lerdorf]

rasmus   Sun, 05 Feb 2012 09:50:14 +

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

Log:
Getting different hashes here. But this test isn't testing the hashes,
it is just making sure we actually get a hash and don't crash.

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/openssl/tests/bug47828.phpt
U   php/php-src/branches/PHP_5_4/ext/openssl/tests/bug47828.phpt
U   php/php-src/trunk/ext/openssl/tests/bug47828.phpt

Modified: php/php-src/branches/PHP_5_3/ext/openssl/tests/bug47828.phpt
===
--- php/php-src/branches/PHP_5_3/ext/openssl/tests/bug47828.phpt
2012-02-05 09:32:20 UTC (rev 323070)
+++ php/php-src/branches/PHP_5_3/ext/openssl/tests/bug47828.phpt
2012-02-05 09:50:14 UTC (rev 323071)
@@ -36,5 +36,5 @@
 echo Done;
 ?
 --EXPECT--
-string(8) 9337ed77
+string(8) %s
 Done

Modified: php/php-src/branches/PHP_5_4/ext/openssl/tests/bug47828.phpt
===
--- php/php-src/branches/PHP_5_4/ext/openssl/tests/bug47828.phpt
2012-02-05 09:32:20 UTC (rev 323070)
+++ php/php-src/branches/PHP_5_4/ext/openssl/tests/bug47828.phpt
2012-02-05 09:50:14 UTC (rev 323071)
@@ -36,5 +36,5 @@
 echo Done;
 ?
 --EXPECT--
-string(8) 9337ed77
+string(8) %s
 Done

Modified: php/php-src/trunk/ext/openssl/tests/bug47828.phpt
===
--- php/php-src/trunk/ext/openssl/tests/bug47828.phpt   2012-02-05 09:32:20 UTC 
(rev 323070)
+++ php/php-src/trunk/ext/openssl/tests/bug47828.phpt   2012-02-05 09:50:14 UTC 
(rev 323071)
@@ -36,5 +36,5 @@
 echo Done;
 ?
 --EXPECT--
-string(8) 9337ed77
+string(8) %s
 Done

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/openssl/tests/bug47828.phpt branches/PHP_5_4/ext/openssl/tests/bug47828.phpt trunk/ext/openssl/tests/bug47828.phpt

[Rasmus Lerdorf]

rasmus   Sun, 05 Feb 2012 09:52:41 +

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

Log:
Need EXPECTF here, of course

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/openssl/tests/bug47828.phpt
U   php/php-src/branches/PHP_5_4/ext/openssl/tests/bug47828.phpt
U   php/php-src/trunk/ext/openssl/tests/bug47828.phpt

Modified: php/php-src/branches/PHP_5_3/ext/openssl/tests/bug47828.phpt
===
--- php/php-src/branches/PHP_5_3/ext/openssl/tests/bug47828.phpt
2012-02-05 09:50:14 UTC (rev 323071)
+++ php/php-src/branches/PHP_5_3/ext/openssl/tests/bug47828.phpt
2012-02-05 09:52:41 UTC (rev 323072)
@@ -35,6 +35,6 @@
 var_dump($arr['hash']);
 echo Done;
 ?
---EXPECT--
+--EXPECTF--
 string(8) %s
 Done

Modified: php/php-src/branches/PHP_5_4/ext/openssl/tests/bug47828.phpt
===
--- php/php-src/branches/PHP_5_4/ext/openssl/tests/bug47828.phpt
2012-02-05 09:50:14 UTC (rev 323071)
+++ php/php-src/branches/PHP_5_4/ext/openssl/tests/bug47828.phpt
2012-02-05 09:52:41 UTC (rev 323072)
@@ -35,6 +35,6 @@
 var_dump($arr['hash']);
 echo Done;
 ?
---EXPECT--
+--EXPECTF--
 string(8) %s
 Done

Modified: php/php-src/trunk/ext/openssl/tests/bug47828.phpt
===
--- php/php-src/trunk/ext/openssl/tests/bug47828.phpt   2012-02-05 09:50:14 UTC 
(rev 323071)
+++ php/php-src/trunk/ext/openssl/tests/bug47828.phpt   2012-02-05 09:52:41 UTC 
(rev 323072)
@@ -35,6 +35,6 @@
 var_dump($arr['hash']);
 echo Done;
 ?
---EXPECT--
+--EXPECTF--
 string(8) %s
 Done

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/openssl/tests/openssl_x509_parse_basic.phpt branches/PHP_5_4/ext/openssl/tests/openssl_x509_parse_basic.phpt trunk/ext/openssl/tests/openssl_x509_pars

[Rasmus Lerdorf]

rasmus   Sun, 05 Feb 2012 10:08:16 +

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

Log:
Another openssl test that is dependent on the openssl version. The output has
changed in more recent versions. Synch with newer output and consider changing
the test to only pick out the more stable fields instead of all of them.

Changed paths:
U   
php/php-src/branches/PHP_5_3/ext/openssl/tests/openssl_x509_parse_basic.phpt
U   
php/php-src/branches/PHP_5_4/ext/openssl/tests/openssl_x509_parse_basic.phpt
U   php/php-src/trunk/ext/openssl/tests/openssl_x509_parse_basic.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/openssl/tests/openssl_x509_parse_basic.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/openssl/tests/openssl_x509_parse_basic.phpt
2012-02-05 09:59:33 UTC (rev 323074)
+++ 
php/php-src/branches/PHP_5_3/ext/openssl/tests/openssl_x509_parse_basic.phpt
2012-02-05 10:08:16 UTC (rev 323075)
@@ -9,7 +9,7 @@
 var_dump(openssl_x509_parse($cert));
 var_dump(openssl_x509_parse($cert, false));
 ?
---EXPECT--
+--EXPECTF--
 array(12) {
   [name]=
   string(96) /C=BR/ST=Rio Grande do Sul/L=Porto Alegre/CN=Henrique do N. 
Angelo/emailAddress=hnang...@php.net
@@ -27,7 +27,7 @@
 string(16) hnang...@php.net
   }
   [hash]=
-  string(8) 088c65c2
+  string(8) %s
   [issuer]=
   array(5) {
 [C]=
@@ -54,7 +54,7 @@
   [validTo_time_t]=
   int(1217413723)
   [purposes]=
-  array(8) {
+  array(9) {
 [1]=
 array(3) {
   [0]=
@@ -127,6 +127,15 @@
   [2]=
   string(10) ocsphelper
 }
+[9]=
+array(3) {
+  [0]=
+  bool(false)
+  [1]=
+  bool(true)
+  [2]=
+  string(13) timestampsign
+}
   }
   [extensions]=
   array(3) {
@@ -158,7 +167,7 @@
 string(16) hnang...@php.net
   }
   [hash]=
-  string(8) 088c65c2
+  string(8) %s
   [issuer]=
   array(5) {
 [countryName]=
@@ -185,7 +194,7 @@
   [validTo_time_t]=
   int(1217413723)
   [purposes]=
-  array(8) {
+  array(9) {
 [1]=
 array(3) {
   [0]=
@@ -258,6 +267,15 @@
   [2]=
   string(11) OCSP helper
 }
+[9]=
+array(3) {
+  [0]=
+  bool(false)
+  [1]=
+  bool(true)
+  [2]=
+  string(18) Time Stamp signing
+}
   }
   [extensions]=
   array(3) {

Modified: 
php/php-src/branches/PHP_5_4/ext/openssl/tests/openssl_x509_parse_basic.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/openssl/tests/openssl_x509_parse_basic.phpt
2012-02-05 09:59:33 UTC (rev 323074)
+++ 
php/php-src/branches/PHP_5_4/ext/openssl/tests/openssl_x509_parse_basic.phpt
2012-02-05 10:08:16 UTC (rev 323075)
@@ -9,7 +9,7 @@
 var_dump(openssl_x509_parse($cert));
 var_dump(openssl_x509_parse($cert, false));
 ?
---EXPECT--
+--EXPECTF--
 array(12) {
   [name]=
   string(96) /C=BR/ST=Rio Grande do Sul/L=Porto Alegre/CN=Henrique do N. 
Angelo/emailAddress=hnang...@php.net
@@ -27,7 +27,7 @@
 string(16) hnang...@php.net
   }
   [hash]=
-  string(8) 088c65c2
+  string(8) %s
   [issuer]=
   array(5) {
 [C]=
@@ -54,7 +54,7 @@
   [validTo_time_t]=
   int(1217413723)
   [purposes]=
-  array(8) {
+  array(9) {
 [1]=
 array(3) {
   [0]=
@@ -127,6 +127,15 @@
   [2]=
   string(10) ocsphelper
 }
+[9]=
+array(3) {
+  [0]=
+  bool(false)
+  [1]=
+  bool(true)
+  [2]=
+  string(13) timestampsign
+}
   }
   [extensions]=
   array(3) {
@@ -158,7 +167,7 @@
 string(16) hnang...@php.net
   }
   [hash]=
-  string(8) 088c65c2
+  string(8) %s
   [issuer]=
   array(5) {
 [countryName]=
@@ -185,7 +194,7 @@
   [validTo_time_t]=
   int(1217413723)
   [purposes]=
-  array(8) {
+  array(9) {
 [1]=
 array(3) {
   [0]=
@@ -258,6 +267,15 @@
   [2]=
   string(11) OCSP helper
 }
+[9]=
+array(3) {
+  [0]=
+  bool(false)
+  [1]=
+  bool(true)
+  [2]=
+  string(18) Time Stamp signing
+}
   }
   [extensions]=
   array(3) {

Modified: php/php-src/trunk/ext/openssl/tests/openssl_x509_parse_basic.phpt
===
--- php/php-src/trunk/ext/openssl/tests/openssl_x509_parse_basic.phpt   
2012-02-05 09:59:33 UTC (rev 323074)
+++ php/php-src/trunk/ext/openssl/tests/openssl_x509_parse_basic.phpt   
2012-02-05 10:08:16 UTC (rev 323075)
@@ -9,7 +9,7 @@
 var_dump(openssl_x509_parse($cert));
 var_dump(openssl_x509_parse($cert, false));
 ?
---EXPECT--
+--EXPECTF--
 array(12) {
   [name]=
   string(96) /C=BR/ST=Rio Grande do Sul/L=Porto Alegre/CN=Henrique do N. 
Angelo/emailAddress=hnang...@php.net
@@ -27,7 +27,7 @@
 string(16) hnang...@php.net
   }
   [hash]=
-  string(8) 088c65c2
+  string(8) %s
   [issuer]=
   array(5) {
 [C]=
@@ -54,7 +54,7 @@
   [validTo_time_t]=
   int(1217413723)
   [purposes]=
-  array(8) {
+  array(9) {
 

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt branches/PHP_5_4/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt trunk/ext/intl/tests/date

[Rasmus Lerdorf]

rasmus   Sun, 05 Feb 2012 10:29:34 +

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

Log:
Without a timezone you can't know whether it is dst or not in this one

Changed paths:
U   
php/php-src/branches/PHP_5_3/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt
U   
php/php-src/branches/PHP_5_4/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt
U   
php/php-src/trunk/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt
2012-02-05 10:08:16 UTC (rev 323075)
+++ 
php/php-src/branches/PHP_5_3/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt
2012-02-05 10:29:34 UTC (rev 323076)
@@ -78,7 +78,7 @@
 // Run the test
 ut_run();
 ?
---EXPECT--
+--EXPECTF--
 ---

 Input text is : Thursday, December 18, 1969 8:49:59 AM PST
@@ -96,7 +96,7 @@
 IntlDateFormatter : DateType::LONG, TimeType::LONG Error : 'Date parsing 
failed: U_PARSE_ERROR'
 
 IntlDateFormatter : DateType::MEDIUM, TimeType::MEDIUM
-tm_sec : '59' , tm_min : '49' , tm_hour : '8' , tm_year : '69' , tm_mday : 
'18' , tm_wday : '3' , tm_yday : '169' , tm_mon : '5' , tm_isdst : '1' ,
+tm_sec : '59' , tm_min : '49' , tm_hour : '8' , tm_year : '69' , tm_mday : 
'18' , tm_wday : '3' , tm_yday : '169' , tm_mon : '5' , tm_isdst : '%d' ,
 
 IntlDateFormatter : DateType::FULL, TimeType::FULL Error : 'Date parsing 
failed: U_PARSE_ERROR'
 ---

Modified: 
php/php-src/branches/PHP_5_4/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt
2012-02-05 10:08:16 UTC (rev 323075)
+++ 
php/php-src/branches/PHP_5_4/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt
2012-02-05 10:29:34 UTC (rev 323076)
@@ -78,7 +78,7 @@
 // Run the test
 ut_run();
 ?
---EXPECT--
+--EXPECTF--
 ---

 Input text is : Thursday, December 18, 1969 8:49:59 AM PST
@@ -96,7 +96,7 @@
 IntlDateFormatter : DateType::LONG, TimeType::LONG Error : 'Date parsing 
failed: U_PARSE_ERROR'
 
 IntlDateFormatter : DateType::MEDIUM, TimeType::MEDIUM
-tm_sec : '59' , tm_min : '49' , tm_hour : '8' , tm_year : '69' , tm_mday : 
'18' , tm_wday : '3' , tm_yday : '169' , tm_mon : '5' , tm_isdst : '1' ,
+tm_sec : '59' , tm_min : '49' , tm_hour : '8' , tm_year : '69' , tm_mday : 
'18' , tm_wday : '3' , tm_yday : '169' , tm_mon : '5' , tm_isdst : '%d' ,
 
 IntlDateFormatter : DateType::FULL, TimeType::FULL Error : 'Date parsing 
failed: U_PARSE_ERROR'
 ---

Modified: 
php/php-src/trunk/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt
===
--- php/php-src/trunk/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt   
2012-02-05 10:08:16 UTC (rev 323075)
+++ php/php-src/trunk/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt   
2012-02-05 10:29:34 UTC (rev 323076)
@@ -78,7 +78,7 @@
 // Run the test
 ut_run();
 ?
---EXPECT--
+--EXPECTF--
 ---

 Input text is : Thursday, December 18, 1969 8:49:59 AM PST
@@ -96,7 +96,7 @@
 IntlDateFormatter : DateType::LONG, TimeType::LONG Error : 'Date parsing 
failed: U_PARSE_ERROR'
 
 IntlDateFormatter : DateType::MEDIUM, TimeType::MEDIUM
-tm_sec : '59' , tm_min : '49' , tm_hour : '8' , tm_year : '69' , tm_mday : 
'18' , tm_wday : '3' , tm_yday : '169' , tm_mon : '5' , tm_isdst : '1' ,
+tm_sec : '59' , tm_min : '49' , tm_hour : '8' , tm_year : '69' , tm_mday : 
'18' , tm_wday : '3' , tm_yday : '169' , tm_mon : '5' , tm_isdst : '%d' ,
 
 IntlDateFormatter : DateType::FULL, TimeType::FULL Error : 'Date parsing 
failed: U_PARSE_ERROR'
 ---

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