[PHP-CVS] svn: php/php-src/branches/PHP_5_2/build/

[Rasmus Lerdorf]

rasmus  Mon, 13 Jul 2009 17:17:19 +

ViewVC URL: http://svn.php.net/viewvc?view=revision&revision=284020

Changed paths:
U   php/php-src/branches/PHP_5_2/build/buildcheck.sh

Log:
cvs->svn


Modified: php/php-src/branches/PHP_5_2/build/buildcheck.sh
===
(Binary files differ)


-- 
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/build/

[Rasmus Lerdorf]

rasmus  Mon, 13 Jul 2009 17:36:49 +

ViewVC URL: http://svn.php.net/viewvc?view=revision&revision=284021

Changed paths:
U   php/php-src/branches/PHP_5_3/build/buildcheck.sh

Log:
svn propdel svn:mime-type build/buildcheck.sh
cvs->svn


Modified: php/php-src/branches/PHP_5_3/build/buildcheck.sh
===
--- php/php-src/branches/PHP_5_3/build/buildcheck.sh2009-07-13 17:17:19 UTC 
(rev 284020)
+++ php/php-src/branches/PHP_5_3/build/buildcheck.sh2009-07-13 17:36:49 UTC 
(rev 284021)
@@ -33,14 +33,14 @@
 if test -z "$ac_version"; then
 echo "buildconf: autoconf not found."
 echo "   You need autoconf version 2.13 or newer installed"
-echo "   to build PHP from CVS."
+echo "   to build PHP from SVN."
 exit 1
 fi
 IFS=.; set $ac_version; IFS=' '
 if test "$1" = "2" -a "$2" -lt "13" || test "$1" -lt "2"; then
 echo "buildconf: autoconf version $ac_version found."
 echo "   You need autoconf version 2.13 or newer installed"
-echo "   to build PHP from CVS."
+echo "   to build PHP from SVN."
 exit 1
 else
 echo "buildconf: autoconf version $ac_version (ok)"
@@ -48,9 +48,9 @@

 if test "$1" = "2" && test "$2" -ge "50"; then
   echo "buildconf: Your version of autoconf likely contains buggy cache code."
-  echo "   Running cvsclean for you."
+  echo "   Running svnclean for you."
   echo "   To avoid this, install autoconf-2.13."
-  ./cvsclean
+  ./svnclean
   stamp=
 fi



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

[PHP-CVS] svn: php/php-src/trunk/win32/build/

[Pierre-Alain Joye]

pajoye  Mon, 13 Jul 2009 21:59:45 +

ViewVC URL: http://svn.php.net/viewvc?view=revision&revision=284027

Changed paths:
_U  php/php-src/trunk/win32/build/buildconf.js
_U  php/php-src/trunk/win32/build/confutils.js
_U  php/php-src/trunk/win32/build/projectgen.js
_U  php/php-src/trunk/win32/build/svnclean.js

Log:
- remove app/js mime


Property changes on: php/php-src/trunk/win32/build/buildconf.js
___
Deleted: svn:mime-type
   - application/javascript


Property changes on: php/php-src/trunk/win32/build/confutils.js
___
Deleted: svn:mime-type
   - application/javascript


Property changes on: php/php-src/trunk/win32/build/projectgen.js
___
Deleted: svn:mime-type
   - application/javascript


Property changes on: php/php-src/trunk/win32/build/svnclean.js
___
Deleted: svn:mime-type
   - application/javascript


-- 
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/Zend/

[David Soria Parra]

dsp Mon, 13 Jul 2009 23:56:38 +

URL: http://svn.php.net/viewvc?view=revision&revision=284034

Changed paths:
U   php/php-src/branches/PHP_5_3/Zend/bench.php

Log:
MFH: Fix date warning by setting the default timezone to UTC

Modified: php/php-src/branches/PHP_5_3/Zend/bench.php
===
--- php/php-src/branches/PHP_5_3/Zend/bench.php 2009-07-13 23:55:34 UTC (rev 
284033)
+++ php/php-src/branches/PHP_5_3/Zend/bench.php 2009-07-13 23:56:38 UTC (rev 
284034)
@@ -3,6 +3,7 @@
date_default_timezone_set("UTC");
 }

+date_default_timezone_set('UTC');
 function simple() {
   $a = 0;
   for ($i = 0; $i < 100; $i++)


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

[PHP-CVS] svn: php/php-src/trunk/ext/bcmath/

[Gwynne Raskind]

gwynne  Tue, 14 Jul 2009 21:54:59 +

URL: http://svn.php.net/viewvc?view=revision&revision=284090

Changed paths:
_U  php/php-src/trunk/ext/bcmath/package.xml
_U  php/php-src/trunk/ext/bz2/package.xml
_U  php/php-src/trunk/ext/calendar/package.xml
_U  php/php-src/trunk/ext/com_dotnet/package.xml
_U  php/php-src/trunk/ext/ctype/ctype.xml
_U  php/php-src/trunk/ext/ctype/package.xml
_U  php/php-src/trunk/ext/curl/package.xml
_U  php/php-src/trunk/ext/dom/examples/note-invalid.xml
_U  php/php-src/trunk/ext/dom/examples/note.xml
_U  php/php-src/trunk/ext/dom/examples/relaxNG.xml
_U  php/php-src/trunk/ext/dom/examples/shipping.xml
_U  php/php-src/trunk/ext/dom/tests/book.xml
_U  php/php-src/trunk/ext/dom/tests/dom.xml
_U  php/php-src/trunk/ext/dom/tests/nsdoc.xml
_U  php/php-src/trunk/ext/dom/tests/xinclude.xml
_U  php/php-src/trunk/ext/enchant/package.xml
_U  php/php-src/trunk/ext/exif/package.xml
_U  php/php-src/trunk/ext/fileinfo/package.xml
_U  php/php-src/trunk/ext/filter/package.xml
_U  php/php-src/trunk/ext/ftp/package.xml
_U  php/php-src/trunk/ext/hash/package.xml
_U  php/php-src/trunk/ext/hash/package2.xml
_U  php/php-src/trunk/ext/json/package.xml
_U  php/php-src/trunk/ext/libxml/tests/test.xml
_U  php/php-src/trunk/ext/mysql/package.xml
_U  php/php-src/trunk/ext/mysqli/package.xml
_U  php/php-src/trunk/ext/oci8/package.xml
_U  php/php-src/trunk/ext/pcntl/package.xml
_U  php/php-src/trunk/ext/pdo/package.xml
_U  php/php-src/trunk/ext/pdo_dblib/package.xml
_U  php/php-src/trunk/ext/pdo_firebird/package.xml
_U  php/php-src/trunk/ext/pdo_mysql/package.xml
_U  php/php-src/trunk/ext/pdo_oci/package2.xml
_U  php/php-src/trunk/ext/pdo_odbc/package.xml
_U  php/php-src/trunk/ext/pdo_pgsql/package2.xml
_U  php/php-src/trunk/ext/pdo_sqlite/package.xml
_U  php/php-src/trunk/ext/phar/package.xml
_U  php/php-src/trunk/ext/phar/tests/cache_list/files/config.xml
_U  php/php-src/trunk/ext/phar/tests/files/config.xml
_U  php/php-src/trunk/ext/posix/package.xml
_U  php/php-src/trunk/ext/session/package.xml
_U  php/php-src/trunk/ext/shmop/package.xml
_U  php/php-src/trunk/ext/simplexml/examples/book.xml
_U  php/php-src/trunk/ext/simplexml/examples/security.xml
_U  php/php-src/trunk/ext/simplexml/tests/000.xml
_U  php/php-src/trunk/ext/simplexml/tests/book.xml
_U  php/php-src/trunk/ext/simplexml/tests/bug24392.xml
_U  php/php-src/trunk/ext/simplexml/tests/bug25756_1.xml
_U  php/php-src/trunk/ext/simplexml/tests/bug25756_2.xml
_U  php/php-src/trunk/ext/simplexml/tests/sxe.xml
_U  php/php-src/trunk/ext/soap/package.xml
_U  php/php-src/trunk/ext/sockets/package.xml
_U  php/php-src/trunk/ext/spl/package.xml
_U  php/php-src/trunk/ext/sqlite/package.xml
_U  php/php-src/trunk/ext/sysvmsg/package.xml
_U  php/php-src/trunk/ext/sysvsem/package.xml
_U  php/php-src/trunk/ext/sysvshm/package.xml
_U  php/php-src/trunk/ext/tidy/package.xml
_U  php/php-src/trunk/ext/tokenizer/package.xml
_U  php/php-src/trunk/ext/unicode/package.xml
_U  php/php-src/trunk/ext/wddx/package.xml
_U  php/php-src/trunk/ext/wddx/tests/wddx.xml
_U  php/php-src/trunk/ext/xml/package.xml
_U  php/php-src/trunk/ext/xml/tests/xmltest.xml
_U  php/php-src/trunk/ext/xmlreader/examples/dtdexample.xml
_U  php/php-src/trunk/ext/xmlreader/examples/relaxNG.xml
_U  php/php-src/trunk/ext/xmlreader/examples/xmlreader.xml
_U  php/php-src/trunk/ext/xmlreader/package.xml
_U  php/php-src/trunk/ext/xmlreader/tests/012.xml
_U  php/php-src/trunk/ext/xmlwriter/package.xml
_U  php/php-src/trunk/ext/xmlwriter/package2.xml
_U  php/php-src/trunk/ext/xsl/tests/area_name.xml
_U  php/php-src/trunk/ext/xsl/tests/exslt.xml
_U  php/php-src/trunk/ext/xsl/tests/xslt.xml
_U  php/php-src/trunk/ext/xsl/tests/xslt011.xml
_U  php/php-src/trunk/ext/zip/tests/bug7658.xml
_U  php/php-src/trunk/ext/zlib/package.xml

Log:
kill bad mime types

Property changes on: php/php-src/trunk/ext/bcmath/package.xml
___
Deleted: svn:mime-type
   - application/xml


Property changes on: php/php-src/trunk/ext/bz2/package.xml
___
Deleted: svn:mime-type
   - application/xml


Property changes on: php/php-src/trunk/ext/calendar/package.xml
___
Deleted: svn:mime-type
   - application/xml


Property changes on: php/php-src/

[PHP-CVS] svn: php/php-src/trunk/ext/pdo_odbc/

[Felipe Pena]

felipe  Wed, 15 Jul 2009 02:31:07 +

URL: http://svn.php.net/viewvc?view=revision&revision=284096

Changed paths:
U   php/php-src/trunk/ext/pdo_odbc/odbc_stmt.c

Log:
- Fixed bug #48913 (Too long error code strings in pdo_odbc driver)

Modified: php/php-src/trunk/ext/pdo_odbc/odbc_stmt.c
===
--- php/php-src/trunk/ext/pdo_odbc/odbc_stmt.c  2009-07-15 02:16:41 UTC (rev 
284095)
+++ php/php-src/trunk/ext/pdo_odbc/odbc_stmt.c  2009-07-15 02:31:07 UTC (rev 
284096)
@@ -532,7 +532,7 @@
default:
strcpy(S->einfo.last_err_msg, "Unknown Attribute");
S->einfo.what = "setAttribute";
-   strcpy(S->einfo.last_state, "IM0001");
+   strcpy(S->einfo.last_state, "IM001");
return -1;
}
 }
@@ -560,7 +560,7 @@
default:
strcpy(S->einfo.last_err_msg, "Unknown Attribute");
S->einfo.what = "getAttribute";
-   strcpy(S->einfo.last_state, "IM0001");
+   strcpy(S->einfo.last_state, "IM001");
return -1;
}
 }

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

[PHP-CVS] svn: php/phpruntests/trunk/tests/configuration/settings/

[Zoe Slattery]

zoe Wed, 15 Jul 2009 12:02:47 +

URL: http://svn.php.net/viewvc?view=revision&revision=284116

Changed paths:
U   
php/phpruntests/trunk/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php

Log:
possible fix to cgi test

Modified: 
php/phpruntests/trunk/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php
===
--- 
php/phpruntests/trunk/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php
2009-07-15 11:30:42 UTC (rev 284115)
+++ 
php/phpruntests/trunk/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php
2009-07-15 12:02:47 UTC (rev 284116)
@@ -25,8 +25,14 @@
 $configuration = 
rtRuntestsConfiguration::getInstance(array('run-tests.php', 'test.phpt'));
 $configuration->setEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE', '');
 $setting = new rtPhpCgiExecutableSetting($configuration);
-
-$this->assertEquals(null, $setting->get());
+
+$setPhp = $configuration->getSetting('TEST_PHP_EXECUTABLE');
+
+if   (preg_match("/sapi/", $setPhp)) {
+// Make no assertion bacuse the CGI executable can be guesed
+} else {
+$this->assertEquals(null, $setting->get());
+}
 }

 public function testSetFromCliExecutableName() {

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

[PHP-CVS] svn: php/php-src/trunk/win32/build/

[Pierre-Alain Joye]

pajoye  Wed, 15 Jul 2009 17:08:26 +

URL: http://svn.php.net/viewvc?view=revision&revision=284135

Changed paths:
U   php/php-src/trunk/win32/build/buildconf.js

Log:
- cvs > svn
Modified: php/php-src/trunk/win32/build/buildconf.js
===
--- php/php-src/trunk/win32/build/buildconf.js	2009-07-15 17:04:11 UTC (rev 284134)
+++ php/php-src/trunk/win32/build/buildconf.js	2009-07-15 17:08:26 UTC (rev 284135)
@@ -1,273 +1,273 @@
-/*
-  +--+
-  | PHP Version 5|
-  +--+
-  | Copyright (c) 1997-2008 The PHP Group|
-  +--+
-  | This source file is subject to version 3.01 of the PHP license,  |
-  | that is bundled with this package in the file LICENSE, and is|
-  | available through the world-wide-web at the following url:   |
-  | http://www.php.net/license/3_01.txt  |
-  | If you did not receive a copy of the PHP license and are unable to   |
-  | obtain it through the world-wide-web, please send a note to  |
-  | lice...@php.net so we can mail you a copy immediately.   |
-  +--+
-  | Author: Wez Furlong|
-  +--+
-*/
-
-/* $Id: buildconf.js,v 1.20 2009-01-02 12:16:42 kalle Exp $ */
-// This generates a configure script for win32 build
-
-WScript.StdOut.WriteLine("Rebuilding configure.js");
-var FSO = WScript.CreateObject("Scripting.FileSystemObject");
-var C = FSO.CreateTextFile("configure.js", true);
-var B = FSO.CreateTextFile("configure.bat", true);
-var DSP = false;
-
-var modules = "";
-var MODULES = WScript.CreateObject("Scripting.Dictionary");
-var module_dirs = new Array();
-
-function file_get_contents(filename)
-{
-	var F = FSO.OpenTextFile(filename, 1);
-	var t = F.ReadAll();
-	F.Close();
-	return t;
-}
-
-function Module_Item(module_name, config_path, dir_line, deps, content)
-{
-	this.module_name = module_name;
-	this.config_path = config_path;
-	this.dir_line = dir_line;
-	this.deps = deps;
-	this.content = content;
-}
-
-function find_config_w32(dirname)
-{
-	if (!FSO.FolderExists(dirname)) {
-		return;
-	}
-
-	var f = FSO.GetFolder(dirname);
-	var	fc = new Enumerator(f.SubFolders);
-	var c, i, ok, n;
-	var item = null;
-	var re_dep_line = new RegExp("ADD_EXTENSION_DEP\\([^,]*\\s*,\\s*['\"]([^'\"]+)['\"].*\\)", "gm");
-
-	for (; !fc.atEnd(); fc.moveNext())
-	{
-		ok = true;
-		/* check if we already picked up a module with the same dirname;
-		 * if we have, don't include it here */
-		n = FSO.GetFileName(fc.item());
-
-		if (n == 'CVS' || n == 'tests')
-			continue;
-
-	//	WScript.StdOut.WriteLine("checking " + dirname + "/" + n);
-		if (MODULES.Exists(n)) {
-			WScript.StdOut.WriteLine("Skipping " + dirname + "/" + n + " -- already have a module with that name");
-			continue;
-		}
-
-		c = FSO.BuildPath(fc.item(), "config.w32");
-		if (FSO.FileExists(c)) {
-//			WScript.StdOut.WriteLine(c);
-
-			var dir_line = "configure_module_dirname = condense_path(FSO.GetParentFolderName('"
-			   	+ c.replace(new RegExp('(["])', "g"), '\\$1') + "'));\r\n";
-			var contents = file_get_contents(c);
-			var deps = new Array();
-
-			// parse out any deps from the file
-			var calls = contents.match(re_dep_line);
-			if (calls != null) {
-for (i = 0; i < calls.length; i++) {
-	// now we need the extension name out of this thing
-	if (calls[i].match(re_dep_line)) {
-//		WScript.StdOut.WriteLine("n depends on " + RegExp.$1);
-		deps[deps.length] = RegExp.$1;
-
-	}
-}
-			}
-
-			item = new Module_Item(n, c, dir_line, deps, contents);
-			MODULES.Add(n, item);
-		}
-	}
-}
-
-// Emit core modules array.  This is used by a snapshot
-// build to override a default "yes" value so that external
-// modules don't break the build by becoming statically compiled
-function emit_core_module_list()
-{
-	var module_names = (new VBArray(MODULES.Keys())).toArray();
-	var i, mod_name, j;
-	var item;
-	var output = "";
-
-	C.WriteLine("core_module_list = new Array(");
-
-	// first, look for modules with empty deps; emit those first
-	for (i in module_names) {
-		mod_name = module_names[i];
-		C.WriteLine("\"" + mod_name.replace(/_/g, "-") + "\",");
-	}
-
-	C.WriteLine("false // dummy");
-
-	C.WriteLine(");");
-}
-
-
-function emit_module(item)
-{
-	return item.dir_line + item.content;
-}
-
-function emit_dep_modules(module_names)
-{
-	var i, mod_name, j;
-	var output = "";
-	var item = null;
-
-	for (i in module_names) {
-		mod_name = module_names[i];
-
-		if (MODULES.Exists(mod_name)) {
-			item 

[PHP-CVS] svn: php/php-src/trunk/ext/mssql/

[Rasmus Lerdorf]

rasmus  Wed, 15 Jul 2009 19:05:09 +

URL: http://svn.php.net/viewvc?view=revision&revision=284144

Changed paths:
U   php/php-src/trunk/ext/mssql/php_mssql.c

Log:
Limit connection strings to 255 chars here


Modified: php/php-src/trunk/ext/mssql/php_mssql.c
===
--- php/php-src/trunk/ext/mssql/php_mssql.c 2009-07-15 18:40:32 UTC (rev 
284143)
+++ php/php-src/trunk/ext/mssql/php_mssql.c 2009-07-15 19:05:09 UTC (rev 
284144)
@@ -550,6 +550,17 @@
return;
}

+   /* Limit strings to 255 chars to prevent overflow issues in underlying 
libraries */
+   if(host_len>255) {
+   host[255] = '\0';
+   }
+   if(user_len>255) {
+   user[255] = '\0';
+   }
+   if(passwd_len>255) {
+   passwd[255] = '\0';
+   }
+
switch(ZEND_NUM_ARGS())
{
case 0:

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

[PHP-CVS] svn: php/php-src/trunk/ext/standard/

[Stanislav Malyshev]

stasWed, 15 Jul 2009 23:57:52 +

URL: http://svn.php.net/viewvc?view=revision&revision=284155

Changed paths:
U   php/php-src/trunk/ext/standard/assert.c

Log:
fix freed mem reference


Modified: php/php-src/trunk/ext/standard/assert.c
===
--- php/php-src/trunk/ext/standard/assert.c 2009-07-15 23:57:10 UTC (rev 
284154)
+++ php/php-src/trunk/ext/standard/assert.c 2009-07-15 23:57:52 UTC (rev 
284155)
@@ -56,6 +56,7 @@
if (EG(in_execution)) {
if (ASSERTG(callback)) {
zval_ptr_dtor(&ASSERTG(callback));
+   ASSERTG(callback) = NULL;
}
if (new_value && (ASSERTG(callback) || new_value_length)) {
MAKE_STD_ZVAL(ASSERTG(callback));

-- 
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/Zend/

[Stanislav Malyshev]

stasThu, 16 Jul 2009 00:02:19 +

URL: http://svn.php.net/viewvc?view=revision&revision=284156

Changed paths:
U   php/php-src/branches/PHP_5_3/Zend/zend_ini.c

Log:
fix ini_restore problem


Modified: php/php-src/branches/PHP_5_3/Zend/zend_ini.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_ini.c2009-07-15 23:57:52 UTC 
(rev 284155)
+++ php/php-src/branches/PHP_5_3/Zend/zend_ini.c2009-07-16 00:02:19 UTC 
(rev 284156)
@@ -46,15 +46,20 @@

 static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage 
TSRMLS_DC) /* {{{ */
 {
+   int result = FAILURE;
if (ini_entry->modified) {
if (ini_entry->on_modify) {
zend_try {
/* even if on_modify bails out, we have to continue on 
with restoring,
since there can be allocated variables that 
would be freed on MM shutdown
and would lead to memory corruption later ini 
entry is modified again */
-   ini_entry->on_modify(ini_entry, 
ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, 
ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC);
+   result = ini_entry->on_modify(ini_entry, 
ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, 
ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC);
} zend_end_try();
}
+   if(stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) {
+   /* runtime failure is OK */
+   return 1;
+   }
if (ini_entry->value != ini_entry->orig_value) {
efree(ini_entry->value);
}

-- 
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_2/Zend/

[Stanislav Malyshev]

stasThu, 16 Jul 2009 00:03:18 +

URL: http://svn.php.net/viewvc?view=revision&revision=284157

Changed paths:
U   php/php-src/branches/PHP_5_2/Zend/zend_ini.c

Log:
fix ini_restore problem


Modified: php/php-src/branches/PHP_5_2/Zend/zend_ini.c
===
--- php/php-src/branches/PHP_5_2/Zend/zend_ini.c2009-07-16 00:02:19 UTC 
(rev 284156)
+++ php/php-src/branches/PHP_5_2/Zend/zend_ini.c2009-07-16 00:03:18 UTC 
(rev 284157)
@@ -46,15 +46,20 @@

 static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage 
TSRMLS_DC) /* {{{ */
 {
+   int result = FAILURE;
if (ini_entry->modified) {
if (ini_entry->on_modify) {
zend_try {
/* even if on_modify bails out, we have to continue on 
with restoring,
since there can be allocated variables that 
would be freed on MM shutdown
and would lead to memory corruption later ini 
entry is modified again */
-   ini_entry->on_modify(ini_entry, 
ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, 
ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC);
+   result = ini_entry->on_modify(ini_entry, 
ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, 
ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC);
} zend_end_try();
}
+   if(stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) {
+   /* runtime failure is OK */
+   return 1;
+   }
if (ini_entry->value != ini_entry->orig_value) {
efree(ini_entry->value);
}

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

[PHP-CVS] svn: php/php-src/trunk/ext/interbase/

[Rasmus Lerdorf]

rasmus  Thu, 16 Jul 2009 00:06:08 +

URL: http://svn.php.net/viewvc?view=revision&revision=284160

Changed paths:
U   php/php-src/trunk/ext/interbase/interbase.c

Log:
Buffer handling fixes


Modified: php/php-src/trunk/ext/interbase/interbase.c
===
--- php/php-src/trunk/ext/interbase/interbase.c 2009-07-16 00:04:59 UTC (rev 
284159)
+++ php/php-src/trunk/ext/interbase/interbase.c 2009-07-16 00:06:08 UTC (rev 
284160)
@@ -861,8 +861,8 @@

 int _php_ibase_attach_db(char **args, int *len, long *largs, isc_db_handle *db 
TSRMLS_DC)
 {
-   short i, dpb_len, buf_len = 256;
-   char dpb_buffer[256] = { isc_dpb_version1 }, *dpb;
+   short i, dpb_len, buf_len = 257-2;  /* version byte at the front, and a 
null at the end */
+   char dpb_buffer[257] = { isc_dpb_version1, 0 }, *dpb;

dpb = dpb_buffer + 1;


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

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

[Jani Taskinen]

janiThu, 16 Jul 2009 12:18:13 +

URL: http://svn.php.net/viewvc?view=revision&revision=284187

Changed paths:
U   php/php-src/trunk/Zend/zend_ini.c

Log:
CS

Modified: php/php-src/trunk/Zend/zend_ini.c
===
--- php/php-src/trunk/Zend/zend_ini.c   2009-07-16 12:16:49 UTC (rev 284186)
+++ php/php-src/trunk/Zend/zend_ini.c   2009-07-16 12:18:13 UTC (rev 284187)
@@ -47,6 +47,7 @@
 static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage 
TSRMLS_DC) /* {{{ */
 {
int result = FAILURE;
+
if (ini_entry->modified) {
if (ini_entry->on_modify) {
zend_try {
@@ -56,7 +57,7 @@
result = ini_entry->on_modify(ini_entry, 
ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, 
ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC);
} zend_end_try();
}
-   if(stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) {
+   if (stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) {
/* runtime failure is OK */
return 1;
}

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

[PHP-CVS] svn: php/phpruntests/trunk/src/testcase/ rtTestConfiguration.php

[Zoe Slattery]

zoe Thu, 16 Jul 2009 16:00:04 +

URL: http://svn.php.net/viewvc?view=revision&revision=284191

Changed paths:
U   php/phpruntests/trunk/src/testcase/rtTestConfiguration.php

Log:
fixing {PWD} in INI sections

Modified: php/phpruntests/trunk/src/testcase/rtTestConfiguration.php
===
--- php/phpruntests/trunk/src/testcase/rtTestConfiguration.php  2009-07-16 
15:49:57 UTC (rev 284190)
+++ php/phpruntests/trunk/src/testcase/rtTestConfiguration.php  2009-07-16 
16:00:04 UTC (rev 284191)
@@ -41,7 +41,7 @@
 $this->setCgiTest($sectionHeadings);

 $this->setEnvironmentVariables($runConfiguration, $sections, 
$fileSection);
-$this->setPhpCommandLineArguments($runConfiguration, $sections);
+$this->setPhpCommandLineArguments($runConfiguration, $sections, 
$fileSection);
 $this->setTestCommandLineArguments($sections);
 $this->setPhpExecutable($runConfiguration, $sectionHeadings);
 $this->setInputFileString($runConfiguration, $sections, 
$sectionHeadings);
@@ -86,10 +86,11 @@

 }

-private function setPhpCommandLineArguments(rtRuntestsConfiguration 
$runConfiguration, $sections)
+private function setPhpCommandLineArguments(rtRuntestsConfiguration 
$runConfiguration, $sections, $fileSection)
 {
 $this->phpCommandLineArguments = 
$runConfiguration->getSetting('PhpCommandLineArguments');
 if (array_key_exists('INI', $sections)) {
+$sections['INI']->substitutePWD($fileSection->getFileName());
 $additionalArguments = $sections['INI']->getCommandLineArguments();
 $args = new rtIniAsCommandLineArgs();
 $this->phpCommandLineArguments = 
$args->settingsToArguments($additionalArguments, 
$this->phpCommandLineArguments);

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

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

[Stanislav Malyshev]

stasFri, 17 Jul 2009 00:57:46 +

URL: http://svn.php.net/viewvc?view=revision&revision=284221

Changed paths:
U   php/php-src/trunk/Zend/zend_ini.c

Log:
fix memory leak


Modified: php/php-src/trunk/Zend/zend_ini.c
===
--- php/php-src/trunk/Zend/zend_ini.c   2009-07-17 00:57:28 UTC (rev 284220)
+++ php/php-src/trunk/Zend/zend_ini.c   2009-07-17 00:57:46 UTC (rev 284221)
@@ -316,8 +316,11 @@
}

if (EG(modified_ini_directives)) {
-   zend_restore_ini_entry_cb(ini_entry, stage TSRMLS_CC);
-   zend_hash_del(EG(modified_ini_directives), name, name_length);
+   if(zend_restore_ini_entry_cb(ini_entry, stage TSRMLS_CC) == 0) {
+   zend_hash_del(EG(modified_ini_directives), name, 
name_length);
+   } else {
+   return FAILURE;
+   }
}

return SUCCESS;

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

[PHP-CVS] svn: php/phpruntests/trunk/src/testcase/ rtPhpTest.php

[Zoe Slattery]

zoe Sat, 18 Jul 2009 17:38:12 +

URL: http://svn.php.net/viewvc?view=revision&revision=284332

Changed paths:
U   php/phpruntests/trunk/src/testcase/rtPhpTest.php

Log:
remove unnecessary check

Modified: php/phpruntests/trunk/src/testcase/rtPhpTest.php
===
--- php/phpruntests/trunk/src/testcase/rtPhpTest.php2009-07-18 17:10:12 UTC 
(rev 284331)
+++ php/phpruntests/trunk/src/testcase/rtPhpTest.php2009-07-18 17:38:12 UTC 
(rev 284332)
@@ -42,7 +42,7 @@
 {
 $lastSection = end($this->sectionHeadings);
 $start=0;
-
+
 foreach($this->sectionHeadings as $keyNumber => $sectionKey) {

 if($keyNumber < count($this->sectionHeadings) - 1) {
@@ -53,20 +53,17 @@
 for($index=$start; $indexcontents); $index++)
 if($this->contents[$index] == "--".$sectionKey."--") {
 //Found the beginning of the section
-
+
 for($contentsLine=$index + 1; 
$contentsLinecontents); $contentsLine ++) {
-
+
 if( ($this->contents[$contentsLine] == "--".$nextKey."--") 
|| ($contentsLine == count($this->contents))) {
 //Found the end of the section OR the end of the test
 $start = $contentsLine - 1;
 if($this->isFileSection($sectionKey)) {
 $tempArray = $this->removeDone($tempArray);
-}
-
-if(count($tempArray) > 0) {
-$testSection = rtSection::getInstance($sectionKey, 
$tempArray);
-$this->sections[$sectionKey] = $testSection;
-}
+}
+$testSection = rtSection::getInstance($sectionKey, 
$tempArray);
+$this->sections[$sectionKey] = $testSection;
 break;
 } else {
 $tempArray[] = $this->contents[$contentsLine];
@@ -183,7 +180,7 @@
 $result = array();
 foreach($array as $line) {
 $result[] = $line;
-// If found at the start of the line, so ' ===done===' won't work.
+// If found at the start of the line, so ' ===done===' won't work.
 if(stripos($line, "===done===") === 0) {
 break;
 }

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

[PHP-CVS] svn: php/phpruntests/trunk/QA/ QATESTS.tgz compareNewOld.php

[Zoe Slattery]

zoe Sat, 18 Jul 2009 17:49:35 +

URL: http://svn.php.net/viewvc?view=revision&revision=284333

Changed paths:
U   php/phpruntests/trunk/QA/QATESTS.tgz
U   php/phpruntests/trunk/QA/compareNewOld.php

Log:
Updated tests and checker

Modified: php/phpruntests/trunk/QA/QATESTS.tgz
===
(Binary files differ)

Modified: php/phpruntests/trunk/QA/compareNewOld.php
===
--- php/phpruntests/trunk/QA/compareNewOld.php  2009-07-18 17:38:12 UTC (rev 
284332)
+++ php/phpruntests/trunk/QA/compareNewOld.php  2009-07-18 17:49:35 UTC (rev 
284333)
@@ -57,7 +57,7 @@
foreach($output as $line) {
if 
(preg_match("/$top_level\/((ext|sapi|Zend|tests)\/\S+)\s{1},(.*)\s{1}$searchFor\s{1}/",
 $line, $matches)) {
 if($searchFor == 'FAIL') {
- if(!preg_match("/XFAIL/", $matches[2])) {
+ if(!preg_match("/XFAIL/", $line)) {
$result[] = $matches[1] . 
".phpt";
}
 } else {
@@ -65,14 +65,14 @@
  }
}

-   }
+   }
 return $result;
 }

 function parseOld($output, $searchFor) {
$result = array();
foreach($output as $line) {
-   if 
(preg_match("/^TEST\s+\d+\/\d+\s+\[(.+\.phpt)\]\s+$searchFor/", $line, 
$matches)) {
+   if 
(preg_match("/^TEST\s+\d+\/\d+\s+\[(.+\.phpt)\]\s+$searchFor\s+/", $line, 
$matches)) {
$result[] = $matches[1];
}
}

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

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

[Felipe Pena]

felipe  Sun, 19 Jul 2009 14:19:32 +

URL: http://svn.php.net/viewvc?view=revision&revision=284351

Changed paths:
U   php/php-src/trunk/Zend/zend_exceptions.c

Log:
- Fixed ZTS build

Modified: php/php-src/trunk/Zend/zend_exceptions.c
===
--- php/php-src/trunk/Zend/zend_exceptions.c2009-07-19 14:00:25 UTC (rev 
284350)
+++ php/php-src/trunk/Zend/zend_exceptions.c2009-07-19 14:19:32 UTC (rev 
284351)
@@ -89,7 +89,7 @@
int name_len, s_classname_len;

classname = NULL_ZSTR;
-   zend_get_object_classname(exception, &classname, &name_len);
+   zend_get_object_classname(exception, &classname, &name_len 
TSRMLS_CC);
zend_unicode_to_string(ZEND_U_CONVERTER(UG(utf8_conv)), 
&s_classname, &s_classname_len, classname.u, u_strlen(classname.u) TSRMLS_CC);

DTRACE_EXCEPTION_THROWN(s_classname);

-- 
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/ configure.in

[Christopher Jones]

sixdSun, 19 Jul 2009 16:27:59 +

URL: http://svn.php.net/viewvc?view=revision&revision=284377
 http://bugs.php.net/48722

Changed paths:
U   php/php-src/branches/PHP_5_3/configure.in

Log:
MFH: Bug #48722 (Update OCI8 --enable-sigchild warning)

Modified: php/php-src/branches/PHP_5_3/configure.in
===
--- php/php-src/branches/PHP_5_3/configure.in   2009-07-19 16:27:35 UTC (rev 
284376)
+++ php/php-src/branches/PHP_5_3/configure.in   2009-07-19 16:27:59 UTC (rev 
284377)
@@ -1577,13 +1577,18 @@
 fi

 if test "$PHP_SIGCHILD" != "yes"; then
+  if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
 cat < processes when using a local Oracle-DB   |
-| please recompile PHP and specify --enable-sigchild when configuring|
-| (This problem has been reported under Linux using Oracle >= 8.1.5) |
+| If you encounter  processes when using a local Oracle  |
+| database, set the value BEQUEATH_DETACH=YES in Oracle Net's|
+| sqlnet.ora file on the PHP host, or set the environment variable   |
+| BEQUEATH_DETACH to YES before starting Apache.  If the problem |
+| still occurs, then recompile PHP and specify --enable-sigchild |
+| when configuring.  |
 X
+  fi
 fi
   fi


-- 
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_2/ configure.in

[Christopher Jones]

sixdSun, 19 Jul 2009 16:28:15 +

URL: http://svn.php.net/viewvc?view=revision&revision=284378
 http://bugs.php.net/48722

Changed paths:
U   php/php-src/branches/PHP_5_2/configure.in

Log:
MFH: Bug #48722 (Update OCI8 --enable-sigchild warning)

Modified: php/php-src/branches/PHP_5_2/configure.in
===
--- php/php-src/branches/PHP_5_2/configure.in   2009-07-19 16:27:59 UTC (rev 
284377)
+++ php/php-src/branches/PHP_5_2/configure.in   2009-07-19 16:28:15 UTC (rev 
284378)
@@ -1556,13 +1556,18 @@
 fi

 if test "$PHP_SIGCHILD" != "yes"; then
+  if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
 cat < processes when using a local Oracle-DB   |
-| please recompile PHP and specify --enable-sigchild when configuring|
-| (This problem has been reported under Linux using Oracle >= 8.1.5) |
+| If you encounter  processes when using a local Oracle  |
+| database, set the value BEQUEATH_DETACH=YES in Oracle Net's|
+| sqlnet.ora file on the PHP host, or set the environment variable   |
+| BEQUEATH_DETACH to YES before starting Apache.  If the problem |
+| still occurs, then recompile PHP and specify --enable-sigchild |
+| when configuring.  |
 X
+  fi
 fi
   fi


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

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

[David Soria Parra]

dsp Mon, 20 Jul 2009 10:12:12 +

Revision: http://svn.php.net/viewvc?view=revision&revision=284423

Changed paths:
U   php/php-src/trunk/Zend/zend.c

Log:
- Fix overflow and use our internal vssprintf implementation

Modified: php/php-src/trunk/Zend/zend.c
===
--- php/php-src/trunk/Zend/zend.c   2009-07-20 09:52:54 UTC (rev 284422)
+++ php/php-src/trunk/Zend/zend.c   2009-07-20 10:12:12 UTC (rev 284423)
@@ -1546,7 +1546,6 @@
zval *orig_user_error_handler;
zend_bool in_compilation;
zend_class_entry *saved_class_entry;
-   char dtrace_error_buffer[1024];
TSRMLS_FETCH();

/* Obtain relevant filename and lineno */
@@ -1592,9 +1591,11 @@
va_start(args, format);

if(DTRACE_ERROR_ENABLED()) {
-   vsprintf(dtrace_error_buffer, format, args);
+   char *dtrace_error_buffer;
+   zend_vspprintf(&dtrace_error_buffer, 0, format, args);
+   DTRACE_ERROR(dtrace_error_buffer, error_filename, error_lineno);
+   efree(dtrace_error_buffer);
}
-   DTRACE_ERROR(dtrace_error_buffer, error_filename, error_lineno);


/* if we don't have a user defined error handler */

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

Re: [PHP-CVS] svn: php/phpruntests/trunk/ Doxyfile build.xml

[Pierre Joye]

hi,

When do you plan to move the doc to either our doc system or using
phpdocumentor?

Cheers,
--
Pierre

On Mon, Jul 20, 2009 at 4:48 PM, Stefan Priebsch wrote:
> spriebsch               Mon, 20 Jul 2009 14:48:02 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=284440
>
> Changed paths:
>        U   php/phpruntests/trunk/Doxyfile
>        U   php/phpruntests/trunk/build.xml
>
> Log:
> Improved build automation.
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>



-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

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

[PHP-CVS] svn: php/phpruntests/trunk/src/testcase/ rtTestResults.php

[Georg Gradwohl]

g2  Mon, 20 Jul 2009 15:00:54 +

Revision: http://svn.php.net/viewvc?view=revision&revision=284442

Changed paths:
U   php/phpruntests/trunk/src/testcase/rtTestResults.php

Log:
minor bugfix - ensure to request skip-section only if it exists

Modified: php/phpruntests/trunk/src/testcase/rtTestResults.php
===
--- php/phpruntests/trunk/src/testcase/rtTestResults.php2009-07-20 
14:51:04 UTC (rev 284441)
+++ php/phpruntests/trunk/src/testcase/rtTestResults.php2009-07-20 
15:00:54 UTC (rev 284442)
@@ -134,7 +134,7 @@
 {
 if ($runConfiguration->hasCommandLineOption('keep-all') || 
$runConfiguration->hasCommandLineOption('keep-skip')) {
 $this->savedFileNames['skipif'] = $this->testName. 'skipif.php';
-} else {
+} else if($testCase->hasSection('SKIPIF')) {
 $skipSection = $testCase->getSection('SKIPIF');
 $skipSection->deleteFile();
 }

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

[PHP-CVS] svn: php/phpruntests/trunk/src/testrun/ rtPhpTestRun.php

[Zoe Slattery]

zoe  Wed, 22 Jul 2009 10:44:08 +

Revision: http://svn.php.net/viewvc?view=revision&revision=284591

Log:
Adding PHP test executable name to the env that is passed to the test runner

Changed paths:
U   php/phpruntests/trunk/src/testrun/rtPhpTestRun.php

Modified: php/phpruntests/trunk/src/testrun/rtPhpTestRun.php
===
--- php/phpruntests/trunk/src/testrun/rtPhpTestRun.php  2009-07-22 10:38:48 UTC 
(rev 284590)
+++ php/phpruntests/trunk/src/testrun/rtPhpTestRun.php  2009-07-22 10:44:08 UTC 
(rev 284591)
@@ -31,6 +31,7 @@
 $runConfiguration->getUserEnvironment();
 $runConfiguration->configure();

+
 //Check help message
 if($runConfiguration->hasCommandLineOption('help') || 
$runConfiguration->hasCommandLineOption('h')) {
 echo rtText::get('help');
@@ -43,6 +44,12 @@
 // $preConditionList->check($this->commandLine, 
$this->environmentVariables);
 $preConditionList->check($runConfiguration);

+
+//Write PHP executable name to the array of env variables. Some
+//test cases expect to be able to use it.
+$php = $runConfiguration->getSetting('PhpExecutable');
+$runConfiguration->setEnvironmentVariable('TEST_PHP_EXECUTABLE', $php);
+

 if ($runConfiguration->getSetting('TestDirectories') != null) {


-- 
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/ NEWS

[Kalle Sommer Nielsen]

kalleSat, 25 Jul 2009 23:40:22 +

Revision: http://svn.php.net/viewvc?view=revision&revision=286332

Log:
BFN #48189

Bug: http://bugs.php.net/48189 (Assigned) ibase_execute error in return param
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-07-25 23:39:21 UTC (rev 286331)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-07-25 23:40:22 UTC (rev 286332)
@@ -1,4 +1,4 @@
-PHPNEWS
+PHP
NEWS
 |||
 ?? ??? 2009, PHP 5.3.1
 - Fixed spl_autoload_unregister/spl_autoload_functions wrt. Closures and
@@ -52,6 +52,7 @@
   (Greg)
 - Fixed bug #48247 (Infinite loop and possible crash during startup with
   errors when errors are logged). (Jani)
+- Fixed bug #48189 (ibase_execute error in return param). (Kalle)
 - Fixed bug #48116 (Fixed build with Openssl 1.0). (Pierre,
   Al dot Smith at aeschi dot ch dot eu dot org)
 - Fixed bug #47481 (natcasesort() does not sort extended ASCII characters

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

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

[Rasmus Lerdorf]

rasmus   Sun, 26 Jul 2009 15:53:36 +

Revision: http://svn.php.net/viewvc?view=revision&revision=286362

Log:
Please review this one.  It seems pretty fundamental.
When $str is a binary string and you do: $str[4]=0;
there should be no unicode conversion.

Changed paths:
U   php/php-src/trunk/Zend/zend_execute.c

Modified: php/php-src/trunk/Zend/zend_execute.c
===
--- php/php-src/trunk/Zend/zend_execute.c   2009-07-26 15:52:50 UTC (rev 
286361)
+++ php/php-src/trunk/Zend/zend_execute.c   2009-07-26 15:53:36 UTC (rev 
286362)
@@ -649,7 +649,7 @@

 static inline int zend_assign_to_string_offset(const temp_variable *T, const 
zval *value, int value_type TSRMLS_DC) /* {{{ */
 {
-   if (Z_TYPE_P(T->str_offset.str) == IS_STRING && Z_TYPE_P(value) != 
IS_STRING) {
+   if (Z_TYPE_P(T->str_offset.str) == IS_STRING && Z_TYPE_P(value) == 
IS_UNICODE) {
convert_to_unicode(T->str_offset.str);
}


-- 
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/ NEWS

[Stanislav Malyshev]

stas Wed, 29 Jul 2009 00:18:19 +

Revision: http://svn.php.net/viewvc?view=revision&revision=286479

Log:
report fix for bug #49065

Bug: http://bugs.php.net/49065 (Verified) "disable_functions" php.ini option 
does not work on Zend extensions
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-07-29 00:17:10 UTC (rev 286478)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-07-29 00:18:19 UTC (rev 286479)
@@ -7,6 +7,8 @@
   Stas)
 - Fixed signature generation/validation for zip archives in ext/phar. (Greg)

+- Fixed bug #49065 ("disable_functions" php.ini option does not work on
+  Zend extensions). (Stas)
 - Fixed bug #49064 (--enable-session=shared does not work: undefined symbol:
   php_url_scanner_reset_vars). (Jani)
 - Fixed bug #49052 (context option headers freed too early when using

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

[PHP-CVS] svn: /php/php-src/trunk/ run-tests.php

[Greg Beaver]

cellog   Wed, 29 Jul 2009 09:22:57 +

Revision: http://svn.php.net/viewvc?view=revision&revision=286499

Log:
fix EXPECTF tests that have binary in their output by always processing output 
and expected output as binary

Changed paths:
U   php/php-src/trunk/run-tests.php

Modified: php/php-src/trunk/run-tests.php
===
--- php/php-src/trunk/run-tests.php	2009-07-29 09:10:52 UTC (rev 286498)
+++ php/php-src/trunk/run-tests.php	2009-07-29 09:22:57 UTC (rev 286499)
@@ -1023,7 +1023,7 @@
 {
 	global $leak_check, $cwd;

-	$data = '';
+	$data = b'';

 	$bin_env = array();
 	foreach((array)$env as $key => $value) {
@@ -1059,23 +1059,23 @@
 			break;
 		} else if ($n === 0) {
 			/* timed out */
-			$data .= "\n ** ERROR: process timed out **\n";
+			$data .= b"\n ** ERROR: process timed out **\n";
 			proc_terminate($proc);
 			return $data;
 		} else if ($n > 0) {
-			$line = fread($pipes[1], 8192);
+			$line = (binary) fread($pipes[1], 8192);
 			if (strlen($line) == 0) {
 /* EOF */
 break;
 			}
-			$data .= (binary) $line;
+			$data .= $line;
 		}
 	}

 	$stat = proc_get_status($proc);

 	if ($stat['signaled']) {
-		$data .= "\nTermsig=" . $stat['stopsig'];
+		$data .= b"\nTermsig=" . $stat['stopsig'];
 	}

 	$code = proc_close($proc);
@@ -1649,7 +1649,7 @@
 COMMAND $cmd
 ";

-	$out = system_with_timeout($cmd, $env, isset($section_text['STDIN']) ? $section_text['STDIN'] : null);
+	$out = (binary) system_with_timeout($cmd, $env, isset($section_text['STDIN']) ? $section_text['STDIN'] : null);

 	if (array_key_exists('CLEAN', $section_text) && (!$no_clean || $cfg['keep']['clean'])) {

@@ -1686,19 +1686,19 @@
 	}

 	// Does the output match what is expected?
-	$output = preg_replace("/\r\n/", "\n", trim($out));
+	$output = preg_replace(b"/\r\n/", b"\n", trim($out));

 	/* when using CGI, strip the headers from the output */
-	$headers = "";
+	$headers = b"";

-	if (isset($old_php) && preg_match("/^(.*?)\r?\n\r?\n(.*)/s", $out, $match)) {
+	if (isset($old_php) && preg_match(b"/^(.*?)\r?\n\r?\n(.*)/s", $out, $match)) {
 		$output = trim($match[2]);
-		$rh = preg_split("/[\n\r]+/", $match[1]);
+		$rh = preg_split(b"/[\n\r]+/", $match[1]);
 		$headers = array();

 		foreach ($rh as $line) {
-			if (strpos($line, ':') !== false) {
-$line = explode(':', $line, 2);
+			if (strpos($line, b':') !== false) {
+$line = explode(b':', $line, 2);
 $headers[trim($line[0])] = trim($line[1]);
 			}
 		}
@@ -1709,13 +1709,13 @@
 	if (isset($section_text['EXPECTHEADERS'])) {
 		$want = array();
 		$wanted_headers = array();
-		$lines = preg_split("/[\n\r]+/", $section_text['EXPECTHEADERS']);
+		$lines = preg_split(b"/[\n\r]+/", (binary) $section_text['EXPECTHEADERS']);

 		foreach($lines as $line) {
-			if (strpos($line, ':') !== false) {
-$line = explode(':', $line, 2);
+			if (strpos($line, b':') !== false) {
+$line = explode(b':', $line, 2);
 $want[trim($line[0])] = trim($line[1]);
-$wanted_headers[] = trim($line[0]) . ': ' . trim($line[1]);
+$wanted_headers[] = trim($line[0]) . b': ' . trim($line[1]);
 			}
 		}

@@ -1727,7 +1727,7 @@

 			if (isset($org_headers[$k])) {
 $headers = $org_headers[$k];
-$output_headers[] = $k . ': ' . $org_headers[$k];
+$output_headers[] = $k . b': ' . $org_headers[$k];
 			}

 			if (!isset($org_headers[$k]) || $org_headers[$k] != $v) {
@@ -1736,9 +1736,9 @@
 		}

 		ksort($wanted_headers);
-		$wanted_headers = join("\n", $wanted_headers);
+		$wanted_headers = join(b"\n", $wanted_headers);
 		ksort($output_headers);
-		$output_headers = join("\n", $output_headers);
+		$output_headers = join(b"\n", $output_headers);
 	}

 	show_file_block('out', $output);
@@ -1752,13 +1752,13 @@
 		}

 		show_file_block('exp', $wanted);
-		$wanted_re = preg_replace('/\r\n/', "\n", $wanted);
+		$wanted_re = preg_replace(b'/\r\n/', b"\n", $wanted);

 		if (isset($section_text['EXPECTF'])) {

 			// do preg_quote, but miss out any %r delimited sections
-			$temp = "";
-			$r = "%r";
+			$temp = b"";
+			$r = b"%r";
 			$startOffset = 0;
 			$length = strlen($wanted_re);
 			while($startOffset < $length) {
@@ -1775,45 +1775,45 @@
 	$start = $end = $length;
 }
 // quote a non re portion of the string
-$temp = $temp . preg_quote(substr($wanted_re, $startOffset, ($start - $startOffset)),  '/');
+$temp = $temp . preg_quote(substr($wanted_re, $startOffset, ($start - $startOffset)),  b'/');
 // add the re unquoted.
-$temp = $temp . '(' . substr($wanted_re, $start+2, ($end - $start-2)). ')';
+$temp = $temp . b'(' . substr($wanted_re, $start+2, ($end - $start-2)). b')';
 $startOffset = $end + 2;
 			}
 			$wanted_re = $temp;

 			$wanted_re = str_replace(
-array('%binary_string_optional%'),
-version_compare(PHP_VERSION, '6.0.0-dev') == -1 ? 'string' : 'binary string',
+array(b'%binary_string_optional%'),
+version_compare(PHP

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

[Jani Taskinen]

jani Wed, 29 Jul 2009 12:50:19 +

Revision: http://svn.php.net/viewvc?view=revision&revision=286507

Log:
- fuck bom

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

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-07-29 11:32:47 UTC (rev 286506)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-07-29 12:50:19 UTC (rev 286507)
@@ -1,4 +1,4 @@
-PHP
NEWS
+PHPNEWS
 |||
 ?? ??? 2009, PHP 5.2.11
 - Fixed regression in cURL extension that prevented flush of data to output

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

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

[Felipe Pena]

felipe   Wed, 29 Jul 2009 14:27:43 +

Revision: http://svn.php.net/viewvc?view=revision&revision=286510

Log:
- Fixed expected data type for class name (%s -> %v)

Changed paths:
U   php/php-src/trunk/Zend/zend_interfaces.c

Modified: php/php-src/trunk/Zend/zend_interfaces.c
===
--- php/php-src/trunk/Zend/zend_interfaces.c2009-07-29 13:51:52 UTC (rev 
286509)
+++ php/php-src/trunk/Zend/zend_interfaces.c2009-07-29 14:27:43 UTC (rev 
286510)
@@ -483,13 +483,13 @@
 ZEND_API int zend_class_serialize_deny(zval *object, int *type, zstr *buffer, 
zend_uint *buf_len, zend_serialize_data *data TSRMLS_DC) /* {{{ */
 {
zend_class_entry *ce = Z_OBJCE_P(object);
-   zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Serialization of '%s' is 
not allowed", ce->name);
+   zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Serialization of '%v' is 
not allowed", ce->name);
return FAILURE;
 } /* }}} */

 ZEND_API int zend_class_unserialize_deny(zval **object, zend_class_entry *ce, 
int type, const zstr buf, zend_uint buf_len, zend_unserialize_data *data 
TSRMLS_DC) /* {{{ */
 {
-   zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Unserialization of '%s' is 
not allowed", ce->name);
+   zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Unserialization of '%v' is 
not allowed", ce->name);
return FAILURE;
 } /* }}} */


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

[PHP-CVS] svn: /web/pecl/trunk/public_html/ account-request.php

[Philip Olson]

philip   Wed, 29 Jul 2009 14:46:28 +

Revision: http://svn.php.net/viewvc?view=revision&revision=286512

Log:
CVS->SVN

Changed paths:
U   web/pecl/trunk/public_html/account-request.php

Modified: web/pecl/trunk/public_html/account-request.php
===
--- web/pecl/trunk/public_html/account-request.php  2009-07-29 14:40:12 UTC 
(rev 286511)
+++ web/pecl/trunk/public_html/account-request.php  2009-07-29 14:46:28 UTC 
(rev 286512)
@@ -43,7 +43,7 @@
  'email',
  'moreinfo',
  'homepage',
- 'needcvs',
+ 'needsvn',
  'showemail');

 foreach ($fields as $field) {
@@ -112,7 +112,7 @@
 $md5pw = md5($password);
 $showemail = @(bool)$showemail;

-$needcvs = @(bool)$needcvs;
+$needsvn = @(bool)$needsvn;

 // hack to temporarily embed the "purpose" in
 // the user's "userinfo" column
@@ -138,10 +138,10 @@
 break;
 }

-/* Now do the CVS stuff */
-if ($needcvs) {
+/* Now do the SVN stuff */
+if ($needsvn) {
 $error = posttohost(
-'http://master.php.net/entry/cvs-account.php',
+'http://master.php.net/entry/svn-account.php',
 array(
 "username" => $handle,
 "name" => $name,
@@ -152,7 +152,7 @@
 );

 if ($error) {
-display_error("Problem submitting the CVS account request: 
$error");
+display_error("Problem submitting the SVN account request: 
$error");
 break;
 }
 }
@@ -162,7 +162,7 @@
"Real Name:{$name}\n".
"Email:{$email}".
(@$showemail ? " (show address)" : " (hide address)") . 
"\n".
-   "Need CVS Account: " . (@$needcvs ? "yes" : "no") . "\n".
+   "Need SVN Account: " . (@$needsvn ? "yes" : "no") . "\n".
"Purpose:\n".
"$purpose\n\n".
"To handle: http://"; . PEAR_CHANNELNAME . 
"/admin/?acreq={$handle}\n";
@@ -201,7 +201,7 @@

 response_header("Request Account");

-$cs_link= 
make_link('http://cvs.php.net/viewvc.cgi/php-src/CODING_STANDARDS', 'PHP Coding 
Standards');
+$cs_link= 
make_link('http://svn.php.net/viewvc/php/php-src/trunk/CODING_STANDARDS', 'PHP 
Coding Standards');
 $lic_link_pecl  = make_link('http://www.php.net/license/3_01.txt', 'PHP 
License 3.01');
 $lic_link_doc   = make_link('http://www.php.net/manual/en/cc.license.php', 
'Creative Commons Attribution License');
 $doc_howto_pecl = make_link('http://wiki.php.net/doc/howto/pecldocs', 
'PECL Docs Howto');
@@ -261,8 +261,8 @@
 
 
  
-  If approved, you will also apply for a 
CVS account
-  in order to commit the code to the php.net CVS repository.
+  If approved, you will also apply for a 
SVN account
+  in order to commit the code to the php.net SVN repository.
  
 

@@ -339,7 +339,7 @@
 $bb->horizHeadRow("First Name:", HTML_Form::returnText("firstname", 
$firstname));
 $bb->horizHeadRow("Last Name:", HTML_Form::returnText("lastname", 
$lastname));
 $bb->horizHeadRow("Password:", HTML_Form::returnPassword("password", null, 
10) . "   Again: " . HTML_Form::returnPassword("password2", null, 10));
-$bb->horizHeadRow("Need a CVS account?", 
HTML_Form::returnCheckbox("needcvs", $needcvs));
+$bb->horizHeadRow("Need a SVN account?", 
HTML_Form::returnCheckbox("needsvn", $needsvn));

 $bb->horizHeadRow("Email address:", HTML_Form::returnText("email", 
$email));
 $bb->horizHeadRow("Show email address?", 
HTML_Form::returnCheckbox("showemail", $showemail));

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

[PHP-CVS] svn: /php/php-src/trunk/ run-tests.php

[Greg Beaver]

cellog   Wed, 29 Jul 2009 16:14:07 +

Revision: http://svn.php.net/viewvc?view=revision&revision=286517

Log:
restore removed line (thanks Jani)

Changed paths:
U   php/php-src/trunk/run-tests.php

Modified: php/php-src/trunk/run-tests.php
===
--- php/php-src/trunk/run-tests.php 2009-07-29 15:41:21 UTC (rev 286516)
+++ php/php-src/trunk/run-tests.php 2009-07-29 16:14:07 UTC (rev 286517)
@@ -1140,6 +1140,7 @@
global $leak_check, $temp_source, $temp_target, $cfg, $environment;
global $no_clean;
global $valgrind_version;
+
$temp_filenames = null;
$org_file = $file;


-- 
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/ NEWS

[Felipe Pena]

felipe   Thu, 30 Jul 2009 00:18:48 +

Revision: http://svn.php.net/viewvc?view=revision&revision=286539

Log:
- Added missing entries from me

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-07-29 23:28:47 UTC (rev 286538)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-07-30 00:18:48 UTC (rev 286539)
@@ -6,6 +6,7 @@
 - Fixed open_basedir circumvention for mail.log. (Maksymilian Arciemowicz,
   Stas)
 - Fixed signature generation/validation for zip archives in ext/phar. (Greg)
+- Fixed memory leak in stream_is_local(). (Felipe)

 - Fixed bug #49065 ("disable_functions" php.ini option does not work on
   Zend extensions). (Stas)
@@ -25,10 +26,13 @@
   (Greg)
 - Fixed bug #49014 (dechunked filter broken when serving more than 8192 bytes 
in
   a chunk). (andreas dot streichardt at globalpark dot com, Ilia)
+- Fixed bug #48980 (Crash when compiling with pdo_firebird). (Felipe)
 - Fixed bug #48962 (cURL does not upload files with specified filename).
   (Ilia)
 - Fixed bug #48929 (Double \r\n after HTTP headers when "header" context
   option is an array). (David Zülke)
+- Fixed bug #48913 (Too long error code strings in pdo_odbc driver).
+  (naf at altlinux dot ru, Felipe)
 - Fixed bug #48912 (Namespace causes unexpected strict behaviour with
   extract()). (Dmitry)
 - Fixed bug #48899 (is_callable returns true even if method does not exist in
@@ -46,6 +50,7 @@
   Windows). (Pierre)
 - Fixed bug #48763 (ZipArchive produces corrupt archive). (dani dot church at
   gmail dot com, Pierre)
+- Fixed bug #48762 (IPv6 address filter still rejects valid address). (Felipe)
 - Fixed bug #48757 (ReflectionFunction::invoke() parameter issues). (Kalle)
 - Fixed bug #48740 (PHAR install fails when INSTALL_ROOT is not the final 
install
   location). (james dot cohen at digitalwindow dot com, Greg)
@@ -66,6 +71,8 @@
 - Fixed bug #48189 (ibase_execute error in return param). (Kalle)
 - Fixed bug #48116 (Fixed build with Openssl 1.0). (Pierre,
   Al dot Smith at aeschi dot ch dot eu dot org)
+- Fixed bug #48057 (Only the date fields of the first row are fetched,
+  others are empty). (info at programmiernutte dot net)
 - Fixed bug #47481 (natcasesort() does not sort extended ASCII characters
   correctly). (Herman Radtke)
 - Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John)

-- 
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/ php_streams.h

[Greg Beaver]

cellog   Fri, 31 Jul 2009 23:44:52 +

Revision: http://svn.php.net/viewvc?view=revision&revision=286603

Log:
fix segfault when running run-tests.php, and general potential for corruption

by calling php_stream_path_encode for unicode strings, 
php_stream_path_param_encode decrements
the refcount, but never restores it, which can cause freeing of zvals before 
they are done being used.

Changed paths:
U   php/php-src/trunk/main/php_streams.h

Modified: php/php-src/trunk/main/php_streams.h
===
--- php/php-src/trunk/main/php_streams.h2009-07-31 21:09:45 UTC (rev 
286602)
+++ php/php-src/trunk/main/php_streams.h2009-07-31 23:44:52 UTC (rev 
286603)
@@ -422,6 +422,7 @@
if (FAILURE == php_stream_path_encode(NULL, &path, &path_len, 
Z_USTRVAL_PP(ppzval), Z_USTRLEN_PP(ppzval), options, context)) {
return FAILURE;
}
+   Z_ADDREF_PP(ppzval); /* the conversion removes a refcount */
MAKE_STD_ZVAL(zpath);
ZVAL_STRINGL(zpath, path, path_len, 0);
Z_UNSET_ISREF_P(zpath);

-- 
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/ NEWS

[Ilia Alshanetsky]

iliaaWed, 05 Aug 2009 19:45:13 +

Revision: http://svn.php.net/viewvc?view=revision&revision=286851

Log:
Minor tweak

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-05 16:37:46 UTC (rev 286850)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-05 19:45:13 UTC (rev 286851)
@@ -18,7 +18,7 @@
   qualified namespaces). (Kalle, Jani)
 - Fixed bug #49074 (private class static fields can be modified by using
   reflection). (Jani)
-- Fixed bug #49108 (2nd scan_dir produces seg fault). (Felipe)
+- Fixed bug #49108 (2nd scan_dir produces segfault). (Felipe)
 - Fixed bug #49065 ("disable_functions" php.ini option does not work on
   Zend extensions). (Stas)
 - Fixed bug #49064 (--enable-session=shared does not work: undefined symbol:

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

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

[Andi Gutmans]

andi Sun, 09 Aug 2009 04:46:02 +

Revision: http://svn.php.net/viewvc?view=revision&revision=286940

Log:
- Optimize slightly for common case - n!=4

Changed paths:
U   php/php-src/trunk/Zend/zend_alloc.c

Modified: php/php-src/trunk/Zend/zend_alloc.c
===
--- php/php-src/trunk/Zend/zend_alloc.c 2009-08-09 04:22:00 UTC (rev 286939)
+++ php/php-src/trunk/Zend/zend_alloc.c 2009-08-09 04:46:02 UTC (rev 286940)
@@ -730,12 +730,14 @@
unsigned int n;
unsigned int index = 0;

-   do {
-   n = offset[_size & 15];
+   n = offset[_size & 15];
+   while (n == 4) {
_size >>= 4;
index += n;
-   } while (n == 4);
-   return index;
+   n = offset[_size & 15];
+   }
+
+   return index + n;
 #endif
 }
 /* }}} */

-- 
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/ NEWS

[Ilia Alshanetsky]

iliaaSun, 09 Aug 2009 15:36:17 +

Revision: http://svn.php.net/viewvc?view=revision&revision=286954

Log:
BFN

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-09 14:50:51 UTC (rev 286953)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-09 15:36:17 UTC (rev 286954)
@@ -8,6 +8,8 @@
 - Fixed signature generation/validation for zip archives in ext/phar. (Greg)
 - Fixed memory leak in stream_is_local(). (Felipe, Tony)

+- Fixed bug #49193 (gdJpegGetVersionString() inside gd_compact identifies
+  wrong type in declaration). (Ilia)
 - Fixed bug #49183 (dns_get_record does not return NAPTR records). (Pierre)
 - Fixed bug #49132 (posix_times returns false without error).
   (phpbugs at gunnu dot us)

-- 
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/ NEWS

[Pierre-Alain Joye]

pajoye   Tue, 11 Aug 2009 15:12:38 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287096

Log:
- fix news

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-11 15:12:00 UTC (rev 287095)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-11 15:12:38 UTC (rev 287096)
@@ -19,13 +19,13 @@
 - Fixed bug #49125 (Error in dba_exists C code). (jdornan at stanford dot edu)
 - Fixed bug #49122 (undefined reference to mysqlnd_stmt_next_result on compile
   with --with-mysqli and MySQL 6.0). (Jani)
+- Fixed bug #49108 (2nd scan_dir produces segfault). (Felipe)
 - Fixed bug #49095 (proc_get_status['exitcode'] fails on win32). (Felipe)
 - Fixed bug #49092 (ReflectionFunction fails to work with functions in fully
   qualified namespaces). (Kalle, Jani)
 - Fixed bug #49074 (private class static fields can be modified by using
   reflection). (Jani)
 - Fixed bug #49072 (feof never returns true for damaged file in zip). (Pierre)
-- Fixed bug #49108 (2nd scan_dir produces segfault). (Felipe)
 - Fixed bug #49065 ("disable_functions" php.ini option does not work on
   Zend extensions). (Stas)
 - Fixed bug #49064 (--enable-session=shared does not work: undefined symbol:

-- 
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_2/ NEWS

[Ilia Alshanetsky]

iliaaTue, 11 Aug 2009 16:11:23 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287100

Log:
Fixed typo

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

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-08-11 15:46:59 UTC (rev 287099)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-08-11 16:11:23 UTC (rev 287100)
@@ -18,7 +18,7 @@
   (Jani)
 - Fixed bug #49026 (proc_open() can bypass safe_mode_protected_env_vars
   restrictions). (Ilia)
-- Fixed bug #48994 (zlib.output_compression does not ouput HTTP headers when
+- Fixed bug #48994 (zlib.output_compression does not output HTTP headers when
   set to a string value). (Jani)
 - Fixed bug #48980 (Crash when compiling with pdo_firebird). (Felipe)
 - Fixed bug #48962 (cURL does not upload files with specified filename).

-- 
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/ NEWS

[Scott MacVicar]

scottmac Tue, 11 Aug 2009 22:45:21 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287122

Log:
Update NEWS entry with some stuff I missed.

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-11 22:22:21 UTC (rev 287121)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-11 22:45:21 UTC (rev 287122)
@@ -1,9 +1,18 @@
 PHPNEWS
 |||
 ?? ??? 2009, PHP 5.3.1
+- Upgraded bundled sqlite to version 3.6.17. (Scott)
+
 - Improve dns_get_record  support on windows. Always available when IPv6 is
   support is installed, format is now the same than on unix. (Pierre)
+- Improve the DNS functions on OSX to use newer APIs, also use Bind 9 API
+  where available on other platforms. (Scott)
+- Improve shared extension loading on OSX to use the standard Unix dlopen() 
API.
+  (Scott)

+- Added error constant when json_encode() detects an invalid UTF-8 sequence.
+  (Scott)
+
 - Fixed spl_autoload_unregister/spl_autoload_functions wrt. Closures and
   Functors. (Christian Seiler)
 - Fixed open_basedir circumvention for mail.log. (Maksymilian Arciemowicz,

-- 
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_2/ NEWS

[Scott MacVicar]

scottmac Wed, 12 Aug 2009 00:21:42 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287128

Log:
BFN

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

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-08-12 00:18:36 UTC (rev 287127)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-08-12 00:21:42 UTC (rev 287128)
@@ -66,6 +66,7 @@
 - Fixed bug #48450 (Compile failure under IRIX 6.5.30 building gd.c). (Kalle)
 - Fixed bug #48400 (imap crashes when closing stream opened with
   OP_PROTOTYPE flag). (Jani)
+- Fixed bug #48284 (hash "adler32" byte order is reversed). (Scott)
 - Fixed bug #48276 (date("Y") on big endian machines produces the
   wrong result). (Scott)
 - Fixed bug #48247 (Infinite loop and possible crash during startup with

-- 
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/ NEWS

[Scott MacVicar]

scottmac Wed, 12 Aug 2009 08:40:05 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287150

Log:
Use the correct tense for the NEWS entries

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-12 08:37:25 UTC (rev 287149)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-12 08:40:05 UTC (rev 287150)
@@ -3,11 +3,11 @@
 ?? ??? 2009, PHP 5.3.1
 - Upgraded bundled sqlite to version 3.6.17. (Scott)

-- Improve dns_get_record  support on windows. Always available when IPv6 is
+- Improved dns_get_record  support on windows. Always available when IPv6 
is
   support is installed, format is now the same than on unix. (Pierre)
-- Improve the DNS functions on OSX to use newer APIs, also use Bind 9 API
+- Improved the DNS functions on OSX to use newer APIs, also use Bind 9 API
   where available on other platforms. (Scott)
-- Improve shared extension loading on OSX to use the standard Unix dlopen() 
API.
+- Improved shared extension loading on OSX to use the standard Unix dlopen() 
API.
   (Scott)

 - Added error constant when json_encode() detects an invalid UTF-8 sequence.

-- 
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/ NEWS

[Ilia Alshanetsky]

iliaaMon, 17 Aug 2009 14:50:34 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287417

Log:
Fixed typo

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-17 14:47:19 UTC (rev 287416)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-17 14:50:34 UTC (rev 287417)
@@ -61,7 +61,7 @@
   in a chunk). (andreas dot streichardt at globalpark dot com, Ilia)
 - Fixed bug #49000 (PHP CLI in Interactive mode (php -a) crashes
   when including files from function). (Stas)
-- Fixed bug #48994 (zlib.output_compression does not ouput HTTP headers when
+- Fixed bug #48994 (zlib.output_compression does not output HTTP headers when
   set to a string value). (Jani)
 - Fixed bug #48980 (Crash when compiling with pdo_firebird). (Felipe)
 - Fixed bug #48962 (cURL does not upload files with specified filename).

-- 
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/ NEWS

[Garrett Serack]

garretts Tue, 18 Aug 2009 14:38:41 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287455

Log:
added missing NEWS entry for bug #49223

Bug: http://bugs.php.net/49223 (Closed) Inconsistency using 
get_defined_constants(true)
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-18 14:08:03 UTC (rev 287454)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-18 14:38:41 UTC (rev 287455)
@@ -1,6 +1,9 @@
 PHPNEWS
 |||
 ?? ??? 2009, PHP 5.3.1
+
+- Fix for bug #49223 Inconsistency using get_defined_constants (Garrett)
+
 - Upgraded bundled sqlite to version 3.6.17. (Scott)

 - Added missing sanity checks around exif processing. (Ilia)

-- 
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/ NEWS

[Pierre-Alain Joye]

pajoye   Tue, 18 Aug 2009 15:18:50 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287457

Log:
- fix NEWS

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-18 14:40:13 UTC (rev 287456)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-18 15:18:50 UTC (rev 287457)
@@ -2,8 +2,6 @@
 |||
 ?? ??? 2009, PHP 5.3.1

-- Fix for bug #49223 Inconsistency using get_defined_constants (Garrett)
-
 - Upgraded bundled sqlite to version 3.6.17. (Scott)

 - Added missing sanity checks around exif processing. (Ilia)
@@ -28,6 +26,7 @@
 - Fixed bug #49269 (Ternary operator fails on Iterator object when used inside
   foreach declaration). (Etienne, Dmitry)
 - Fixed bug #49236 (Missing PHP_SUBST(PDO_MYSQL_SHARED_LIBADD)). (Jani)
+- Fixed bug #49223 (Inconsistency using get_defined_constants). (Garrett)
 - Fixed bug #49193 (gdJpegGetVersionString() inside gd_compact identifies
   wrong type in declaration). (Ilia)
 - Fixed bug #49183 (dns_get_record does not return NAPTR records). (Pierre)

-- 
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/ NEWS

[Pierre-Alain Joye]

pajoye   Wed, 19 Aug 2009 18:45:13 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287481

Log:
- fix NEWS

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-19 18:43:46 UTC (rev 287480)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-19 18:45:13 UTC (rev 287481)
@@ -8,12 +8,12 @@
 - Added error constant when json_encode() detects an invalid UTF-8 sequence.
   (Scott)

-- Improved dns_get_record  support on windows. Always available when IPv6 
is
-  support is installed, format is now the same than on unix. (Pierre)
+- Improved dns_get_record  support on windows. Always available when IPv6
+  is support is installed, format is now the same than on unix. (Pierre)
 - Improved the DNS functions on OSX to use newer APIs, also use Bind 9 API
   where available on other platforms. (Scott)
-- Improved shared extension loading on OSX to use the standard Unix dlopen() 
API.
-  (Scott)
+- Improved shared extension loading on OSX to use the standard Unix dlopen()
+  API. (Scott)

 - Fixed spl_autoload_unregister/spl_autoload_functions wrt. Closures and
   Functors. (Christian Seiler)
@@ -142,8 +142,9 @@
 - Fixed bug #45554 (Inconsistent behavior of the u format char). (Derick)
 - Fixed bug #43510 (stream_get_meta_data() does not return same mode as used
   in fopen). (Jani)
-- Fixed #43327, wrong return value from mail(), if sendmail_path is wrong. 
(Garrett)
-- Fixed bug #42434 (ImageLine w/ antialias = 1px shorter). (wojjie at gmail dot
+- Fixed #43327, wrong return value from mail(), if sendmail_path is wrong.
+  (Garrett)
+- Fixed bug #42434 (ImageLine w/ antialias = 1px shorter). (wojjie at gmail dot
   com, Kalle)
 - Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo).
   (Kalle, Rick Yorgason)

-- 
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/ NEWS

[Pierre-Alain Joye]

pajoye   Tue, 25 Aug 2009 23:22:52 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287718

Log:
- update news for my last TSRM fixes

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-25 22:50:49 UTC (rev 287717)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-25 23:22:52 UTC (rev 287718)
@@ -14,6 +14,9 @@
 - Improved shared extension loading on OSX to use the standard Unix dlopen()
   API. (Scott)

+- Fixed possilbe bad caching of symlinked directories in the realpath cache
+  on Windows. (Pierre)
+- Fixed atime and mtime in stat related functions on Windows. (Pierre)
 - Fixed spl_autoload_unregister/spl_autoload_functions wrt. Closures and
   Functors. (Christian Seiler)
 - Fixed open_basedir circumvention for "mail.log" ini directive.
@@ -56,6 +59,8 @@
   strings as option keys). (Jani)
 - Fixed bug #49052 (context option headers freed too early when using
   --with-curlwrappers). (Jani)
+- Fixed bug #49047 (The function touch() fails on directories on Windows).
+  (Pierre)
 - Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference).
   (Jani)
 - Fixed bug #49026 (proc_open() can bypass safe_mode_protected_env_vars

-- 
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/ NEWS

[Pierre-Alain Joye]

pajoye   Wed, 26 Aug 2009 20:58:06 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287782

Log:
- update

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-26 20:44:05 UTC (rev 287781)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-26 20:58:06 UTC (rev 287782)
@@ -110,6 +110,8 @@
   gmail dot com, Pierre)
 - Fixed bug #48762 (IPv6 address filter still rejects valid address). (Felipe)
 - Fixed bug #48757 (ReflectionFunction::invoke() parameter issues). (Kalle)
+- Fuxed bug #48746 (Unable to browse directories within Junction Points).
+  (Pierre, Kanwaljeet Singla)
 - Fixed bug #48740 (PHAR install fails when INSTALL_ROOT is not the final
   install location). (james dot cohen at digitalwindow dot com, Greg)
 - Fixed bug #48733 (CURLOPT_WRITEHEADER|CURLOPT_FILE|CURLOPT_STDERR warns on

-- 
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/ NEWS

[Andrey Hristov]

andrey   Thu, 27 Aug 2009 13:26:46 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287808

Log:
Forgot to save the file. Here comes the entry

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-27 13:16:39 UTC (rev 287807)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-27 13:26:46 UTC (rev 287808)
@@ -67,6 +67,7 @@
   (Pierre)
 - Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference).
   (Jani)
+- Fixed bug #49027 (mysqli_options() doesn't work when using mysqlnd). (Andrey)
 - Fixed bug #49026 (proc_open() can bypass safe_mode_protected_env_vars
   restrictions). (Ilia)
 - Fixed bug #49012 (phar tar signature algorithm reports as Unknown (0) in

-- 
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/ NEWS

[Jani Taskinen]

jani Sat, 29 Aug 2009 01:16:30 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287872

Log:
- Fix news

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-28 22:46:43 UTC (rev 287871)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-29 01:16:30 UTC (rev 287872)
@@ -7,11 +7,10 @@
 - Added error constant when json_encode() detects an invalid UTF-8 sequence.
   (Scott)

-
 - Improved readlink on Windows, supress \??\ and use the drive syntax only.
- (Pierre)
-- Improved dns_get_record  support on windows. Always available when IPv6
-  is support is installed, format is now the same than on unix. (Pierre)
+  (Pierre)
+- Improved dns_get_record()  support on windows. Always available when
+  IPv6 is support is installed, format is now the same than on unix. (Pierre)
 - Improved the DNS functions on OSX to use newer APIs, also use Bind 9 API
   where available on other platforms. (Scott)
 - Improved shared extension loading on OSX to use the standard Unix dlopen()
@@ -147,15 +146,15 @@
   (Sriram Natarajan)
 - Fixed bug #48116 (Fixed build with Openssl 1.0). (Pierre,
   Al dot Smith at aeschi dot ch dot eu dot org)
-- Fixed bug #48057 (Only the date fields of the first row are fetched,
-  others are empty). (info at programmiernutte dot net)
+- Fixed bug #48057 (Only the date fields of the first row are fetched, others
+  are empty). (info at programmiernutte dot net)
 - Fixed bug #47481 (natcasesort() does not sort extended ASCII characters
   correctly). (Herman Radtke)
 - Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John)
 - Fixed bug #47273 (Encoding bug in SoapServer->fault). (Dmitry)
 - Fixed bug #46682 (touch() afield returns different values on windows).
   (Pierre)
-- Fiexs bug #46614 (Extended MySQLi class gives incorrect empty() result).
+- Fixed bug #46614 (Extended MySQLi class gives incorrect empty() result).
   (Andrey)
 - Fixed bug #46020 (with Sun Java System Web Server 7.0 on HPUX, #define HPUX).
   (Uwe Schindler)

-- 
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/ NEWS

[Pierre-Alain Joye]

pajoye   Tue, 01 Sep 2009 17:53:00 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287951

Log:
- readdir/scandir entry

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-09-01 17:50:59 UTC (rev 287950)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-09-01 17:53:00 UTC (rev 287951)
@@ -16,6 +16,7 @@
 - Improved shared extension loading on OSX to use the standard Unix dlopen()
   API. (Scott)

+- Fixed scandir/readdir when used mounted points on Windows. (Pierre)
 - Fixed zlib.deflate compress filter to actually accept level parameter. (Jani)
 - Fixed leak on error in popen/exec (and related functions) on Windows.
   (Pierre)

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

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

[Kalle Sommer Nielsen]

kalleTue, 01 Sep 2009 20:12:02 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287953

Log:
Fix build

Changed paths:
U   php/php-src/trunk/win32/readdir.c

Modified: php/php-src/trunk/win32/readdir.c
===
--- php/php-src/trunk/win32/readdir.c   2009-09-01 19:41:51 UTC (rev 287952)
+++ php/php-src/trunk/win32/readdir.c   2009-09-01 20:12:02 UTC (rev 287953)
@@ -26,6 +26,7 @@
HANDLE handle;
int index;
char resolved_path_buff[MAXPATHLEN];
+   TSRMLS_FETCH();

if (!VCWD_REALPATH(dir, resolved_path_buff)) {
return NULL;

-- 
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/ NEWS

[Ilia Alshanetsky]

iliaaWed, 02 Sep 2009 00:14:46 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287956

Log:
Fixed typo

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-09-01 23:26:44 UTC (rev 287955)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-09-02 00:14:46 UTC (rev 287956)
@@ -7,7 +7,7 @@
 - Added error constant when json_encode() detects an invalid UTF-8 sequence.
   (Scott)

-- Improved readlink on Windows, supress \??\ and use the drive syntax only.
+- Improved readlink on Windows, suppress \??\ and use the drive syntax only.
   (Pierre)
 - Improved dns_get_record()  support on windows. Always available when
   IPv6 is support is installed, format is now the same than on unix. (Pierre)

-- 
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_2/ NEWS

[Jani Taskinen]

jani Wed, 02 Sep 2009 06:30:47 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287961

Log:
- Add missing bug fixing news

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

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-09-02 05:34:36 UTC (rev 287960)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-09-02 06:30:47 UTC (rev 287961)
@@ -18,6 +18,7 @@
   authentication details). (Dmitry)
 - Fixed bug #49000 (PHP CLI in Interactive mode (php -a) crashes when including
   files from function). (Stas)
+- Fixed bug #48696 (ldap_read() segfaults with invalid parameters). (Felipe)
 - Fixed bug #47273 (Encoding bug in SoapServer->fault). (Dmitry)
 - Fixed bug #28038  (Sent incorrect RCPT TO commands to SMTP server) (Garrett)


-- 
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_2/ NEWS

[Pierre-Alain Joye]

pajoye   Thu, 03 Sep 2009 12:54:46 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287989

Log:
- missing )

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

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-09-03 12:25:26 UTC (rev 287988)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-09-03 12:54:46 UTC (rev 287989)
@@ -8,7 +8,8 @@

 - Fixed sanity check for the color index in imagecolortransparent. (Pierre)
 - Fixed zlib.deflate compress filter to actually accept level parameter. (Jani)
-- Fixed leak on error in popen/exec (and related functions on Windows. (Pierre)
+- Fixed leak on error in popen/exec (and related functions) on Windows.
+  (Pierre)

 - Fixed bug #49361 (wordwrap() wraps incorrectly on end of line boundaries).
   (Ilia, code-it at mail dot ru)

-- 
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_2/ NEWS

[Jani Taskinen]

jani Thu, 03 Sep 2009 12:20:26 +

Revision: http://svn.php.net/viewvc?view=revision&revision=287987

Log:
- Prepare for b-day :D

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

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-09-03 12:18:16 UTC (rev 287986)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-09-03 12:20:26 UTC (rev 287987)
@@ -1,9 +1,10 @@
 PHPNEWS
 |||
-??  2009, PHP 5.2.11
+0? Sep 2009, PHP 5.2.11

+
 03 Sep 2009, PHP 5.2.11RC2
-- Added missing sanity checks around exif processing (Ilia)
+- Added missing sanity checks around exif processing. (Ilia)

 - Fixed sanity check for the color index in imagecolortransparent. (Pierre)
 - Fixed zlib.deflate compress filter to actually accept level parameter. (Jani)

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

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

[Pierre-Alain Joye]

pajoye   Thu, 03 Sep 2009 19:11:30 +

Revision: http://svn.php.net/viewvc?view=revision&revision=288002

Log:
- MF53: len includes the NULL already

Changed paths:
U   php/php-src/trunk/TSRM/tsrm_virtual_cwd.c

Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c   2009-09-03 18:47:43 UTC (rev 
288001)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c   2009-09-03 19:11:30 UTC (rev 
288002)
@@ -746,7 +746,7 @@
*(path + bufindex) = 0;
j = bufindex;
} else {
-   j = rname_len + 1;
+   j = len;
}
tsrm_free_alloca(pbuffer, use_heap_large);


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

[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures52.wxs

[Pierre-Alain Joye]

pajoye   Fri, 04 Sep 2009 07:37:07 +

Revision: http://svn.php.net/viewvc?view=revision&revision=288030

Log:
- fix install of pgsql and mssql, required DLLs were not installed

Changed paths:
U   php/win-installer/trunk/ExtensionsFeatures52.wxs

Modified: php/win-installer/trunk/ExtensionsFeatures52.wxs
===
--- php/win-installer/trunk/ExtensionsFeatures52.wxs2009-09-04 07:28:53 UTC 
(rev 288029)
+++ php/win-installer/trunk/ExtensionsFeatures52.wxs2009-09-04 07:37:07 UTC 
(rev 288030)
@@ -220,6 +220,7 @@



+   



@@ -283,6 +284,7 @@



+   



@@ -299,6 +301,7 @@



+   



@@ -322,6 +325,7 @@



+   




-- 
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_2/ NEWS

[Jani Taskinen]

jani Fri, 04 Sep 2009 22:11:32 +

Revision: http://svn.php.net/viewvc?view=revision&revision=288072

Log:
- some styling

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

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-09-04 21:47:07 UTC (rev 288071)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-09-04 22:11:32 UTC (rev 288072)
@@ -2,8 +2,8 @@
 |||
 0? Sep 2009, PHP 5.2.11
 - Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
-- Fixed bug #49447 (php engine need to correctly check for socket API
-  return status on windows). (Sriram Natarajan)
+- Fixed bug #49447 (php engine needs to correctly check for socket API return
+  status on windows). (Sriram Natarajan)


 03 Sep 2009, PHP 5.2.11RC2
@@ -28,7 +28,7 @@
   files from function). (Stas)
 - Fixed bug #48696 (ldap_read() segfaults with invalid parameters). (Felipe)
 - Fixed bug #47273 (Encoding bug in SoapServer->fault). (Dmitry)
-- Fixed bug #28038  (Sent incorrect RCPT TO commands to SMTP server) (Garrett)
+- Fixed bug #28038 (Sent incorrect RCPT TO commands to SMTP server) (Garrett)


 13 Aug 2009, PHP 5.2.11RC1

-- 
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_2/ NEWS

[Ilia Alshanetsky]

iliaaTue, 08 Sep 2009 22:14:29 +

Revision: http://svn.php.net/viewvc?view=revision&revision=288175

Log:
TZ news

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

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-09-08 21:18:54 UTC (rev 288174)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-09-08 22:14:29 UTC (rev 288175)
@@ -1,6 +1,7 @@
 PHPNEWS
 |||
 0? Sep 2009, PHP 5.2.11
+- Updated timezone database to version 2009.13 (2009m) (Derick)
 - Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters).
 - Fixed bug #49447 (php engine needs to correctly check for socket API return
   status on windows). (Sriram Natarajan)

-- 
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_2/ NEWS

[Jani Taskinen]

jani Wed, 09 Sep 2009 07:38:03 +

Revision: http://svn.php.net/viewvc?view=revision&revision=288190

Log:
Ihnetd.

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

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-09-09 07:37:10 UTC (rev 288189)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-09-09 07:38:03 UTC (rev 288190)
@@ -1,12 +1,14 @@
 PHPNEWS
 |||
-0? Sep 2009, PHP 5.2.11
+?? Sep 2009, PHP 5.2.11
 - Updated timezone database to version 2009.13 (2009m) (Derick)
+
 - Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters).
 - Fixed bug #49447 (php engine needs to correctly check for socket API return
   status on windows). (Sriram Natarajan)
 - Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)

+
 03 Sep 2009, PHP 5.2.11RC2
 - Added missing sanity checks around exif processing. (Ilia)

@@ -421,6 +423,9 @@
   either disable or change the compile time ini scan directory (FR #45114).
   (Jani)

+- Reverted fix for bug #44197 due to behaviour change in minor version.
+  (Felipe)
+
 - Fixed missing initialization of BG(page_uid) and BG(page_gid),
   reported by Maksymilian Arciemowicz. (Stas)
 - Fixed memory leak inside sqlite_create_aggregate(). (Felipe)
@@ -466,8 +471,6 @@
   attribute.(Scott)
 - Fixed a crash on invalid method in ReflectionParameter constructor.
   (Christian Seiler)
-- Reverted fix for bug #44197 due to behaviour change in minor version.
-  (Felipe)

 - Fixed bug #46732 (mktime.year description is wrong). (Derick)
 - Fixed bug #46696 (cURL fails in upload files with specified content-type).
@@ -715,6 +718,8 @@


 01 May 2008, PHP 5.2.6
+- Upgraded PCRE to version 7.6 (Nuno)
+
 - Fixed two possible crashes inside posix extension (Tony)
 - Fixed incorrect heredoc handling when label is used within the block.
   (Matt)
@@ -734,7 +739,6 @@
 - Fixed segfault in filter extension when using callbacks. (Arnar Mar Sig,
   Felipe)
 - Fixed faulty fix for bug #40189 (endless loop in zlib.inflate stream 
filter). (Greg)
-- Upgraded PCRE to version 7.6 (Nuno)

 - Fixed bug #44742 (timezone_offset_get() causes segmentation faults). (Derick)
 - Fixed bug #44720 (Prevent crash within session_register()). (Scott)

-- 
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_2/ NEWS

[Jani Taskinen]

jani Mon, 14 Sep 2009 17:18:27 +

Revision: http://svn.php.net/viewvc?view=revision&revision=288337

Log:
pfft

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

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-09-14 16:51:11 UTC (rev 288336)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-09-14 17:18:27 UTC (rev 288337)
@@ -1,13 +1,14 @@
 PHPNEWS
 |||
 ?? Sep 2009, PHP 5.2.11
-- Fixed certificate validation inside php_openssl_apply_verification_policy
+- Fixed certificate validation inside php_openssl_apply_verification_policy.
   (Ryan Sleevi, Ilia)

+
 10 Sep 2009, PHP 5.2.11RC3
 - Updated timezone database to version 2009.13 (2009m) (Derick)

-- Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters).
+- Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters). (Ilia)
 - Fixed bug #49447 (php engine needs to correctly check for socket API return
   status on windows). (Sriram Natarajan)
 - Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)

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

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

[Pierre Joye]

pajoye   Mon, 10 Jan 2011 00:59:19 +

Revision: http://svn.php.net/viewvc?view=revision&revision=307317

Log:
- WS

Changed paths:
U   php/php-src/trunk/TSRM/tsrm_virtual_cwd.c

Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c   2011-01-10 00:43:08 UTC (rev 
307316)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c   2011-01-10 00:59:19 UTC (rev 
307317)
@@ -840,8 +840,8 @@
memcpy(tmp, path, len+1);

if(save &&
-   !(IS_UNC_PATH(path, len) && len >= 3 && path[2] != '?') &&
-   (data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
+   !(IS_UNC_PATH(path, len) && len >= 3 && path[2] 
!= '?') &&
+   (data.dwFileAttributes & 
FILE_ATTRIBUTE_REPARSE_POINT)) {
/* File is a reparse point. Get the target */
HANDLE hLink = NULL;
REPARSE_DATA_BUFFER * pbuffer;

-- 
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/ php_output.h

[Andrey Hristov]

andrey   Fri, 14 Jan 2011 12:32:27 +

Revision: http://svn.php.net/viewvc?view=revision&revision=307474

Log:
gcc barks about these, so clean it

Changed paths:
U   php/php-src/trunk/main/php_output.h

Modified: php/php-src/trunk/main/php_output.h
===
--- php/php-src/trunk/main/php_output.h 2011-01-14 12:23:44 UTC (rev 307473)
+++ php/php-src/trunk/main/php_output.h 2011-01-14 12:32:27 UTC (rev 307474)
@@ -50,7 +50,7 @@
 typedef enum _php_output_handler_status_t {
PHP_OUTPUT_HANDLER_FAILURE,
PHP_OUTPUT_HANDLER_SUCCESS,
-   PHP_OUTPUT_HANDLER_NO_DATA,
+   PHP_OUTPUT_HANDLER_NO_DATA
 } php_output_handler_status_t;

 /* php_output_stack_pop() flags */
@@ -76,7 +76,7 @@
PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE,
PHP_OUTPUT_HANDLER_HOOK_DISABLE,
/* unused */
-   PHP_OUTPUT_HANDLER_HOOK_LAST,
+   PHP_OUTPUT_HANDLER_HOOK_LAST
 } php_output_handler_hook_t;

 #define PHP_OUTPUT_HANDLER_INITBUF_SIZE(s) \
@@ -147,7 +147,7 @@
php_output_handler *running;
char *output_start_filename;
int output_start_lineno;
-ZEND_END_MODULE_GLOBALS(output);
+ZEND_END_MODULE_GLOBALS(output)

 /* there should not be a need to use OG() from outside of output.c */
 #ifdef ZTS

-- 
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/ NEWS

[Johannes Schlüter]

johannes Fri, 14 Jan 2011 14:54:18 +

Revision: http://svn.php.net/viewvc?view=revision&revision=307477

Log:
- Fix 5.3.5 date in NEWS

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-01-14 13:53:59 UTC (rev 307476)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-01-14 14:54:18 UTC (rev 307477)
@@ -115,7 +115,7 @@
   . Fixed bug #53603 (ZipArchive should quiet stat errors). (brad dot froehle 
at
 gmail dot com, Gustavo)

-?? ??? 2011, PHP 5.3.5
+06 Jan 2011, PHP 5.3.5
 - Fixed Bug #53632 (infinite loop with x87 fpu). (CVE-2010-4645) (Scott,
   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/ NEWS

[Pierre Joye]

pajoye   Tue, 18 Jan 2011 22:22:28 +

Revision: http://svn.php.net/viewvc?view=revision&revision=307564

Log:
- #53577 and cleanup

Bug: http://bugs.php.net/53577 (Duplicate) Regression (5.3.3-5.3.4) in 
open_basedir with a trailing forward slash
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-01-18 22:20:09 UTC (rev 307563)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-01-18 22:22:28 UTC (rev 307564)
@@ -14,12 +14,15 @@
 (Stas)

 - Core:
+  . Fixed bug #53577 (Regression (5.3.3-5.3.4) in open_basedir with a
+trailing forward slash). (lekensteyn at gmail dot com, Pierre)
+  . Fixed bug #53682 (Fix compile on the VAX). (Rasmus, jklos)
   . Fixed bug #48484 (array_product() always returns 0 for an empty array).
 (Ilia)
   . Fixed bug #48607 (fwrite() doesn't check reply from ftp server before
 exiting). (Ilia)
-  . Fixed bug #53682 (Fix compile on the VAX). (Rasmus, jklos)

+
 - Calendar extension:
   . Fixed bug #53574 (Integer overflow in SdnToJulian, sometimes leading to
 segfault). (Gustavo)

-- 
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/ NEWS

[Pierre Joye]

pajoye   Tue, 18 Jan 2011 23:31:53 +

Revision: http://svn.php.net/viewvc?view=revision&revision=307570

Log:
- clarity

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-01-18 22:46:59 UTC (rev 307569)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-01-18 23:31:53 UTC (rev 307570)
@@ -14,7 +14,7 @@
 (Stas)

 - Core:
-  . Fixed bug #53577 (Regression (5.3.3-5.3.4) in open_basedir with a
+  . Fixed bug #53577 (Regression introduced in 5.3.4 in open_basedir with a
 trailing forward slash). (lekensteyn at gmail dot com, Pierre)
   . Fixed bug #53682 (Fix compile on the VAX). (Rasmus, jklos)
   . Fixed bug #48484 (array_product() always returns 0 for an empty array).

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

[PHP-CVS] svn: /php/php-src/trunk/win32/ inet.h

[Pierre Joye]

pajoye   Wed, 19 Jan 2011 19:48:28 +

Revision: http://svn.php.net/viewvc?view=revision&revision=307596

Log:
- xp sp3 does not have them

Changed paths:
U   php/php-src/trunk/win32/inet.h

Modified: php/php-src/trunk/win32/inet.h
===
--- php/php-src/trunk/win32/inet.h  2011-01-19 19:45:26 UTC (rev 307595)
+++ php/php-src/trunk/win32/inet.h  2011-01-19 19:48:28 UTC (rev 307596)
@@ -3,7 +3,7 @@
 #endif
 #include 

-#if (_WIN32_WINNT <= 0x500)
+#if (_WIN32_WINNT <= 0x502)
 PHPAPI int inet_pton(int af, const char* src, void* dst);
 PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size);
 PHPAPI int inet_aton(const char *cp, struct in_addr *inp);

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

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

[Pierre Joye]

pajoye   Wed, 19 Jan 2011 21:40:15 +

Revision: http://svn.php.net/viewvc?view=revision&revision=307600

Log:
- fix warning about undefined zend_multibyte_set_filter and 
zend_multibyte_yyinput_again, why are they not in zend_multibyte.h btw?

Changed paths:
U   php/php-src/trunk/Zend/zend_compile.c

Modified: php/php-src/trunk/Zend/zend_compile.c
===
--- php/php-src/trunk/Zend/zend_compile.c   2011-01-19 21:19:45 UTC (rev 
307599)
+++ php/php-src/trunk/Zend/zend_compile.c   2011-01-19 21:40:15 UTC (rev 
307600)
@@ -28,6 +28,7 @@
 #include "zend_exceptions.h"
 #include "tsrm_virtual_cwd.h"
 #include "zend_multibyte.h"
+#include "zend_language_scanner.h"

 #define CONSTANT_EX(op_array, op) \
(op_array)->literals[op].constant

-- 
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

[Pierre Joye]

pajoye   Thu, 20 Jan 2011 12:23:30 +

Revision: http://svn.php.net/viewvc?view=revision&revision=307624

Log:
- should not have been applied

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   2011-01-20 11:22:00 UTC (rev 307623)
+++ php/php-src/trunk/main/main.c   2011-01-20 12:23:30 UTC (rev 307624)
@@ -1864,13 +1864,7 @@
 #endif
GetModuleFileName((HINSTANCE)&__ImageBase, module_path, MAX_PATH);
php_dirname(module_path, strlen(module_path));
-   {
-   char dll_dir[MAX_PATH];
-   sprintf(dll_dir, "%s\\%s", module_path, "..\\..\\deps\\bin");
-   SetDllDirectory(dll_dir);
-   }
-// GetModuleFileName (NULL, module_path, MAX_PATH);
-//__debugbreak();
+
 #ifdef ZTS
tsrm_ls = ts_resource(0);
 #endif

-- 
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

[Felipe Pena]

felipe   Thu, 20 Jan 2011 12:32:41 +

Revision: http://svn.php.net/viewvc?view=revision&revision=307625

Log:
- Removed accidental changes

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   2011-01-20 12:23:30 UTC (rev 307624)
+++ php/php-src/trunk/main/main.c   2011-01-20 12:32:41 UTC (rev 307625)
@@ -1823,7 +1823,6 @@
}
 }
 #endif
-EXTERN_C IMAGE_DOS_HEADER __ImageBase;

 /* {{{ php_module_startup
  */
@@ -1862,8 +1861,6 @@
 #else
php_os=PHP_OS;
 #endif
-   GetModuleFileName((HINSTANCE)&__ImageBase, module_path, MAX_PATH);
-   php_dirname(module_path, strlen(module_path));

 #ifdef ZTS
tsrm_ls = ts_resource(0);

-- 
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/ NEWS

[Pierre Joye]

pajoye   Wed, 26 Jan 2011 18:38:44 +

Revision: http://svn.php.net/viewvc?view=revision&revision=307766

Log:
- #53837

Bug: http://bugs.php.net/53837 (Closed) Gettext extension crashes PHP/Apache
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-01-26 16:19:02 UTC (rev 307765)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-01-26 18:38:44 UTC (rev 307766)
@@ -48,6 +48,10 @@
   . Fixed bug #47435 (FILTER_FLAG_NO_RES_RANGE don't work with ipv6).
 (Ilia, valli at icsurselva dot ch)

+- Gettext
+  . Fixed bug #53837 (_() crashes on Windows when no LANG or LANGUAGE
+environment variable are set). (Pierre)
+
 - IMAP extension:
   . Implemented FR #53812 (get MIME headers of the part of the email). (Stas)
   . Fixed bug #53377 (imap_mime_header_decode() doesn't ignore \t during long

-- 
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/ NEWS

[Adam Harvey]

aharvey  Fri, 28 Jan 2011 04:17:08 +

Revision: http://svn.php.net/viewvc?view=revision&revision=307806

Log:
Fix NEWS typo.

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-01-28 03:55:34 UTC (rev 307805)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-01-28 04:17:08 UTC (rev 307806)
@@ -144,7 +144,7 @@
 (Hannes)
   . Fixed bug #53603 (ZipArchive should quiet stat errors). (brad dot froehle 
at
 gmail dot com, Gustavo)
-  . Fixed bzg #53166 (Missing parameters in docs and reflection definition).
+  . Fixed bug #53166 (Missing parameters in docs and reflection definition).
 (Richard)

 06 Jan 2011, PHP 5.3.5

-- 
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/ NEWS

[Adam Harvey]

aharvey  Fri, 28 Jan 2011 04:30:12 +

Revision: http://svn.php.net/viewvc?view=revision&revision=307808

Log:
Fix NEWS sorting.

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-01-28 04:19:40 UTC (rev 307807)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-01-28 04:30:12 UTC (rev 307808)
@@ -138,14 +138,14 @@

 - Zip extension:
   . Added the filename into the return value of stream_get_meta_data(). 
(Hannes)
+  . Fixed bug #53166 (Missing parameters in docs and reflection definition).
+(Richard)
   . Fixed bug #53568 (swapped memset arguments in struct initialization).
 (crrodriguez at opensuse dot org)
   . Fixed bug #53579 (stream_get_contents() segfaults on ziparchive streams).
 (Hannes)
   . Fixed bug #53603 (ZipArchive should quiet stat errors). (brad dot froehle 
at
 gmail dot com, Gustavo)
-  . Fixed bug #53166 (Missing parameters in docs and reflection definition).
-(Richard)
   . Fixed bug #53854 (Missing constants for compression type). (Richard, Adam)

 06 Jan 2011, PHP 5.3.5

-- 
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/ SAPI.c

[Kalle Sommer Nielsen]

kalleThu, 03 Feb 2011 23:57:59 +

Revision: http://svn.php.net/viewvc?view=revision&revision=307986

Log:
Fix ZTS build

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

Modified: php/php-src/trunk/main/SAPI.c
===
--- php/php-src/trunk/main/SAPI.c   2011-02-03 22:09:18 UTC (rev 307985)
+++ php/php-src/trunk/main/SAPI.c   2011-02-03 23:57:59 UTC (rev 307986)
@@ -145,7 +145,7 @@
 }
 /* }}} */

-static void sapi_run_header_callback()
+static void sapi_run_header_callback(TSRMLS_D)
 {
int   error;
zend_fcall_info fci;
@@ -831,7 +831,7 @@

if (SG(callback_func) && !SG(callback_run)) {
SG(callback_run) = 1;
-   sapi_run_header_callback();
+   sapi_run_header_callback(TSRMLS_C);
}

SG(headers_sent) = 1;

-- 
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/ NEWS

[Adam Harvey]

aharvey  Fri, 04 Feb 2011 10:55:34 +

Revision: http://svn.php.net/viewvc?view=revision&revision=308015

Log:
Update 5.3.6 NEWS to use a consistent bug ordering. I've gone with Pierre's
order on Internals for now (new features, then non-bug tracker fixes, then bugs
in descending order of bug number) -- feel free to bikeshed this on Internals
or IRC, but we need to pick _something_, because it's all over the place at
present. (And yes, I'm partly to blame for that too.)

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-02-04 10:50:42 UTC (rev 308014)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-02-04 10:55:34 UTC (rev 308015)
@@ -63,40 +63,40 @@
 MIME header unfolding). (Adam)

 - Intl extension:
+  . Fixed bug #53612 (Segmentation fault when using cloned several intl
+objects). (Gustavo)
   . Fixed bug #53512 (NumberFormatter::setSymbol crash on bogus $attr values).
 (Felipe)
-  . Fixed bug #53612 (Segmentation fault when using cloned several intl
-objects). (Gustavo)
   . Implemented clone functionality for number, date & message formatters.
 (Stas).

 - MySQL Improved extension:
   . Added 'db' and 'catalog' keys to the field fetching functions (FR #39847).
 (Kalle)
+  . Fixed buggy counting of affected rows when using the text protocol. The
+collected statistics were wrong when multi_query was used with mysqlnd
+(Andrey)
   . Fixed bug #53795 (Connect Error from MySqli (mysqlnd) when using SSL).
 (Kalle)
   . Fixed bug #53503 (mysqli::query returns false after successful LOAD DATA
 query). (Kalle, Andrey)
   . Fixed bug #53425 (mysqli_real_connect() ignores client flags when built to
 call libmysql). (Kalle, tre-php-net at crushedhat dot com)
-  . Fixed buggy counting of affected rows when using the text protocol. The
-collected statistics were wrong when multi_query was used with mysqlnd
-(Andrey)

 - OpenSSL extension:
+  . Fixed stream_socket_enable_crypto() not honoring the socket timeout in
+server mode. (Gustavo)
+  . Fixed bug #53592 (stream_socket_enable_crypto() busy-waits in client mode).
+(Gustavo)
   . Implemented FR #53447 (Cannot disable SessionTicket extension for servers
 that do not support it) by adding a no_ticket SSL context option. (Adam,
 Tony)
-  . Fixed bug #53592 (stream_socket_enable_crypto() busy-waits in client mode).
-(Gustavo)
-  . Fixed stream_socket_enable_crypto() not honoring the socket timeout in
-server mode. (Gustavo)

 - PDO MySQL driver:
+  . Fixed bug #53551 (PDOStatement execute segfaults for pdo_mysql driver).
+(Johannes)
   . Implemented FR #47802 (Support for setting character sets in DSN strings).
 (Kalle)
-  . Fixed bug #53551 (PDOStatement execute segfaults for pdo_mysql driver).
-(Johannes)

 - PDO Oracle driver:
   . Fixed bug #39199 (Cannot load Lob data with more than 4000 bytes on
@@ -111,10 +111,10 @@
 (crrodriguez at opensuse dot org, Ilia)

 - PHP-FPM SAPI:
-  . Fixed bug #53527 (php-fpm --test doesn't set a valuable return value). 
(fat)
   . Enforce security in the fastcgi protocol parsing.
 (ef-lists at email dotde)
   . Fixed bug #53777 (php-fpm log format now match php_error log format). (fat)
+  . Fixed bug #53527 (php-fpm --test doesn't set a valuable return value). 
(fat)
   . Fixed bug #53434 (php-fpm slowlog now also logs the original request). 
(fat)

 - Readline extension:
@@ -125,6 +125,10 @@
   . Fixed bug #53915 (ReflectionClass::getConstant(s) emits fatal error on
 constants with self::). (Gustavo)

+- SNMP extension:
+  . Fixed bug #51336 (snmprealwalk (snmp v1) does not handle end of OID tree
+correctly). (Boris Lytochkin)
+
 - SOAP extension:
   . Fixed possible crash introduced by the NULL poisoning patch.
 (Mateusz Kocielski, Pierre)
@@ -145,11 +149,11 @@
 all of the rows have been fetched). (Scott)

 - Streams:
-  . Implemented FR #26158 (open arbitrary file descriptor with fopen). 
(Gustavo)
   . Fixed bug #53913 (Streams functions assume HAVE_GLOB is defined). (Chris
 Jones)
   . Fixed bug #53903 (userspace stream stat callback does not separate the
 elements of the returned array before converting them). (Gustavo)
+  . Implemented FR #26158 (open arbitrary file descriptor with fopen). 
(Gustavo)

 - XSL extension:
   . Fixed memory leaked introduced by the NULL poisoning patch.
@@ -158,23 +162,20 @@
 - Zip extension:
   . Added the filename into the return value of stream_get_meta_data(). 
(Hannes)
   . Fixed bug #53923 (Zip functions assume HAVE_GLOB is defined). (Adam)
+  . Fixed bug #53885 (ZipArchive segfault with FL_UNCHANGED on empty archive).
+(Stas, Maksymilian Arciemowicz).
+  . Fixed bug #53854 (Missing constants for compression type). (Richard, Adam)
+  . Fixed bug #53603 (ZipArchive should qui

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

[Peter Cowburn]

salathe  Fri, 11 Feb 2011 22:31:52 +

Revision: http://svn.php.net/viewvc?view=revision&revision=308266

Log:
Oopsie, fix typo in UPGRADING

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

Modified: php/php-src/branches/PHP_5_3/UPGRADING
===
--- php/php-src/branches/PHP_5_3/UPGRADING  2011-02-11 22:16:33 UTC (rev 
308265)
+++ php/php-src/branches/PHP_5_3/UPGRADING  2011-02-11 22:31:52 UTC (rev 
308266)
@@ -671,7 +671,7 @@
ReflectionClass::getNamespaceName()
ReflectionClass::getShortName()
- SPL:  DirectoryIterator::getExtension()
-   SplFileObject::getExtension()
+   SplFileInfo::getExtension()
SplObjectStorage::addAll()
SplObjectStorage::removeAll()
- XSL:  XSLTProcessor::setProfiling()

-- 
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/ NEWS

[Pierre Joye]

pajoye   Sat, 12 Feb 2011 20:25:48 +

Revision: http://svn.php.net/viewvc?view=revision&revision=308298

Log:
-  add CVE

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-02-12 19:31:46 UTC (rev 308297)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-02-12 20:25:48 UTC (rev 308298)
@@ -174,8 +174,9 @@
 - Zip extension:
   . Added the filename into the return value of stream_get_meta_data(). 
(Hannes)
   . Fixed bug #53923 (Zip functions assume HAVE_GLOB is defined). (Adam)
+  . Fixed bug #53893 (Wrong return value for ZipArchive::extractTo()). (Pierre)
   . Fixed bug #53885 (ZipArchive segfault with FL_UNCHANGED on empty archive).
-(Stas, Maksymilian Arciemowicz).
+(Stas, Maksymilian Arciemowicz). (CVE-2011-0421)
   . Fixed bug #53854 (Missing constants for compression type). (Richard, Adam)
   . Fixed bug #53603 (ZipArchive should quiet stat errors). (brad dot froehle 
at
 gmail dot com, Gustavo)

-- 
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/ NEWS

[Hannes Magnusson]

bjoriMon, 14 Feb 2011 15:34:04 +

Revision: http://svn.php.net/viewvc?view=revision&revision=308328

Log:
bfn for #54016

Bug: http://bugs.php.net/54016 (Assigned) finfo_file: Cannot determine filetype 
in archives
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-02-14 15:32:02 UTC (rev 308327)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-02-14 15:34:04 UTC (rev 308328)
@@ -62,6 +62,10 @@
   . Fixed bug #47435 (FILTER_FLAG_NO_RES_RANGE don't work with ipv6).
 (Ilia, valli at icsurselva dot ch)

+- Fileinfo extension:
+  . Fixed bug #54016 (finfo_file() Cannot determine filetype in archives).
+(Hannes)
+
 - Gettext
   . Fixed bug #53837 (_() crashes on Windows when no LANG or LANGUAGE
 environment variable are set). (Pierre)

-- 
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/ acinclude.m4

[Pierre Joye]

pajoye   Tue, 15 Feb 2011 08:28:22 +

Revision: http://svn.php.net/viewvc?view=revision&revision=308352

Log:
- fix build with ICU < 4.2, add ICU_VERSION for m4 checks

Changed paths:
U   php/php-src/branches/PHP_5_3/acinclude.m4

Modified: php/php-src/branches/PHP_5_3/acinclude.m4
===
--- php/php-src/branches/PHP_5_3/acinclude.m4   2011-02-15 08:28:03 UTC (rev 
308351)
+++ php/php-src/branches/PHP_5_3/acinclude.m4   2011-02-15 08:28:22 UTC (rev 
308352)
@@ -2228,6 +2228,7 @@
   AC_MSG_ERROR([ICU version 3.4 or later is required])
 fi

+ICU_VERSION=$icu_version
 ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
 ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
 PHP_EVAL_INCLINE($ICU_INCS)

-- 
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/ NEWS

[Johannes Schlüter]

johannes Wed, 16 Feb 2011 20:12:08 +

Revision: http://svn.php.net/viewvc?view=revision&revision=308397

Log:
- WS

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-02-16 17:13:01 UTC (rev 308396)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-02-16 20:12:08 UTC (rev 308397)
@@ -38,7 +38,7 @@

 - DOM extension:
   . Implemented FR #39771 (Made DOMDocument::saveHTML accept an optional 
DOMNode
-   like DOMDocument::saveXML). (Gustavo)
+like DOMDocument::saveXML). (Gustavo)

 - DateTime extension:
   . Fixed a bug in DateTime->modify() where absolute date/time statements had

-- 
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/ NEWS

[Pierre Joye]

pajoye   Fri, 18 Feb 2011 17:22:27 +

Revision: http://svn.php.net/viewvc?view=revision&revision=308473

Log:
- bug #54002 entry

Bug: http://bugs.php.net/54002 (error getting bug information)
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-02-18 17:14:01 UTC (rev 308472)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-02-18 17:22:27 UTC (rev 308473)
@@ -5,6 +5,9 @@
   . Fixed bug #43512 (same parameter name can be used multiple times in
 method/function definition). (Felipe)

+- Exif extension
+  . Fixed bug #54002 (crash on crafted tag, reported by Luca Carettoni). 
(Pierre). (CVE-2011-0708)
+
 17 Feb 2011, PHP 5.3.6RC1
 - Upgraded bundled Sqlite3 to version 3.7.4. (Ilia)
 - Upgraded bundled PCRE to version 8.11. (Ilia)

-- 
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/ SAPI.c

[Pierre Joye]

pajoye   Fri, 25 Feb 2011 11:28:33 +

Revision: http://svn.php.net/viewvc?view=revision&revision=308665

Log:
- fix regression (carsten_st...@gmx.de)

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

Modified: php/php-src/trunk/main/SAPI.c
===
--- php/php-src/trunk/main/SAPI.c   2011-02-25 11:07:06 UTC (rev 308664)
+++ php/php-src/trunk/main/SAPI.c   2011-02-25 11:28:33 UTC (rev 308665)
@@ -680,7 +680,7 @@
do {
header_line_len--;
} while(header_line_len && 
isspace(header_line[header_line_len-1]));
-   header_line[--header_line_len]='\0';
+   header_line[header_line_len]='\0';
}

if (op == SAPI_HEADER_DELETE) {

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

RE: [PHP-CVS] svn: /php/php-src/trunk/ NEWS

[Ford, Mike]

While you're about it, how about being a little less ppositive about the 
pposition of multibyte suppport?

Cheers!

Mike

 -- 
Mike Ford,
Electronic Information Developer, Libraries and Learning Innovation,  
Leeds Metropolitan University, C507 City Campus, 
Woodhouse Lane, LEEDS,  LS1 3HE,  United Kingdom 
Email: m.f...@leedsmet.ac.uk 
Tel: +44 113 812 4730



> -Original Message-
> From: Sebastian Bergmann [mailto:sebast...@php.net]
> Sent: 06 March 2011 21:48
> To: php-cvs@lists.php.net
> Subject: [PHP-CVS] svn: /php/php-src/trunk/ NEWS
> 
> sebastianSun, 06 Mar 2011 21:47:46
> +
> 
> Revision: http://svn.php.net/viewvc?view=revision&revision=308980
> 
> Log:
> Fix speling.
> 
> Changed paths:
> U   php/php-src/trunk/NEWS
> 
> Modified: php/php-src/trunk/NEWS
> ===
> --- php/php-src/trunk/NEWS2011-03-06 19:31:23 UTC (rev 308979)
> +++ php/php-src/trunk/NEWS2011-03-06 21:47:46 UTC (rev 308980)
> @@ -31,7 +31,7 @@
>a property into a warning. (Scott)
> 
>  - General improvements:
> -  . Added multibyte suppport by default. Previosly php had to be
> compiled
> +  . Added multibyte suppport by default. Previously php had to be
> compiled
>  with --enable-zend-multibyte. Now it can be enabled or disabled
> throug
>  zend.multibyte directive in php.ini (Dmitry)
>. Removed compile time dependency from ext/mbstring (Dmitry)



To view the terms under which this email is distributed, please go to 
http://disclaimer.leedsmet.ac.uk/email.htm

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

[Felipe Pena]

felipe   Tue, 08 Mar 2011 13:12:52 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309019

Log:
- Missing "reported by" info

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-03-08 13:11:14 UTC (rev 309018)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-03-08 13:12:52 UTC (rev 309019)
@@ -3,6 +3,7 @@
 ?? ??? 2011, PHP 5.3.6
 - Shmop extension:
   . Fixed bug #54193 (Integer overflow in shmop_read()). (Felipe)
+Reported by Jose Carlos Norte 

 03 Mar 2011, PHP 5.3.6RC2
 - Zend Engine:

-- 
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/ NEWS

[Felipe Pena]

felipe   Tue, 08 Mar 2011 14:07:25 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309021

Log:
- assign CVE

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-03-08 13:23:27 UTC (rev 309020)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-03-08 14:07:25 UTC (rev 309021)
@@ -3,7 +3,7 @@
 ?? ??? 2011, PHP 5.3.6
 - Shmop extension:
   . Fixed bug #54193 (Integer overflow in shmop_read()). (Felipe)
-Reported by Jose Carlos Norte 
+Reported by Jose Carlos Norte  (CVE-2011-1092)

 03 Mar 2011, PHP 5.3.6RC2
 - Zend Engine:

-- 
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/ NEWS

[Felipe Pena]

felipe   Mon, 14 Mar 2011 22:27:40 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309237

Log:
- BFN

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-03-14 21:46:16 UTC (rev 309236)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-03-14 22:27:40 UTC (rev 309237)
@@ -1,5 +1,10 @@
 PHP
NEWS
 |||
+?? Mar 2011, PHP 5.3.6
+- Phar extension:
+  . Fixed bug #54247 (format-string vulnerability on Phar). (Felipe)
+(CVE-2011-1153)
+
 10 Mar 2011, PHP 5.3.6RC3
 - Shmop extension:
   . Fixed bug #54193 (Integer overflow in shmop_read()). (Felipe)

-- 
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/ SAPI.c

[Pierre Joye]

pajoye   Tue, 15 Mar 2011 17:13:44 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309261

Log:
- make setlocale thread only, drastically reduce TS related crashes in error 
mgt and other parts like pcre, and actually a good thing (tm)

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

Modified: php/php-src/trunk/main/SAPI.c
===
--- php/php-src/trunk/main/SAPI.c   2011-03-15 17:03:59 UTC (rev 309260)
+++ php/php-src/trunk/main/SAPI.c   2011-03-15 17:13:44 UTC (rev 309261)
@@ -80,6 +80,7 @@

 #ifdef ZTS
ts_allocate_id(&sapi_globals_id, sizeof(sapi_globals_struct), 
(ts_allocate_ctor) sapi_globals_ctor, (ts_allocate_dtor) sapi_globals_dtor);
+   _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
 #else
sapi_globals_ctor(&sapi_globals);
 #endif

-- 
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/ SAPI.c

[Pierre Joye]

pajoye   Tue, 15 Mar 2011 17:14:32 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309262

Log:
- windows only

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

Modified: php/php-src/trunk/main/SAPI.c
===
--- php/php-src/trunk/main/SAPI.c   2011-03-15 17:13:44 UTC (rev 309261)
+++ php/php-src/trunk/main/SAPI.c   2011-03-15 17:14:32 UTC (rev 309262)
@@ -80,7 +80,9 @@

 #ifdef ZTS
ts_allocate_id(&sapi_globals_id, sizeof(sapi_globals_struct), 
(ts_allocate_ctor) sapi_globals_ctor, (ts_allocate_dtor) sapi_globals_dtor);
+# ifdef PHP_WIN32
_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+# endif
 #else
sapi_globals_ctor(&sapi_globals);
 #endif

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

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

[Stanislav Malyshev]

stas Wed, 16 Mar 2011 05:41:50 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309266

Log:
fix UMR when setting forward string offset

Changed paths:
U   php/php-src/trunk/Zend/zend_execute.c

Modified: php/php-src/trunk/Zend/zend_execute.c
===
--- php/php-src/trunk/Zend/zend_execute.c   2011-03-16 05:25:02 UTC (rev 
309265)
+++ php/php-src/trunk/Zend/zend_execute.c   2011-03-16 05:41:50 UTC (rev 
309266)
@@ -671,7 +671,7 @@
return;
}
}
-
+
/* separate our value if necessary */
if (value_type == IS_TMP_VAR) {
zval *orig_value = value;
@@ -737,7 +737,7 @@
if (IS_INTERNED(Z_STRVAL_P(T->str_offset.str))) {
char *tmp = (char *) 
emalloc(T->str_offset.offset+1+1);

-   memcpy(tmp, Z_STRVAL_P(T->str_offset.str), 
T->str_offset.offset+1+1);
+   memcpy(tmp, Z_STRVAL_P(T->str_offset.str), 
Z_STRLEN_P(T->str_offset.str)+1);
Z_STRVAL_P(T->str_offset.str) = tmp;
} else {
Z_STRVAL_P(T->str_offset.str) = (char *) 
erealloc(Z_STRVAL_P(T->str_offset.str), T->str_offset.offset+1+1);
@@ -756,7 +756,7 @@

if (Z_TYPE_P(value) != IS_STRING) {
zval tmp;
-
+
ZVAL_COPY_VALUE(&tmp, value);
if (value_type != IS_TMP_VAR) {
zval_copy_ctor(&tmp);
@@ -979,7 +979,7 @@
goto fetch_string_dim;

case IS_STRING:
-
+
offset_key = dim->value.str.val;
offset_key_length = dim->value.str.len;

@@ -992,7 +992,7 @@
} else {
hval = zend_hash_func(offset_key, 
offset_key_length+1);
}
-   }
+   }
 fetch_string_dim:
if (zend_hash_quick_find(ht, offset_key, 
offset_key_length+1, hval, (void **) &retval) == FAILURE) {
switch (type) {
@@ -1267,7 +1267,7 @@
Z_STRVAL_P(ptr) = (char*)emalloc(2);
Z_STRVAL_P(ptr)[0] = 
Z_STRVAL_P(container)[Z_LVAL_P(dim)];
Z_STRVAL_P(ptr)[1] = 0;
-   Z_STRLEN_P(ptr) = 1;
+   Z_STRLEN_P(ptr) = 1;
}
AI_SET_PTR(result, ptr);
return;

-- 
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/ NEWS

[Pierre Joye]

pajoye   Wed, 16 Mar 2011 23:57:04 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309320

Log:
- news entry for the setlocale fix

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-03-16 23:54:14 UTC (rev 309319)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-03-16 23:57:04 UTC (rev 309320)
@@ -2,11 +2,14 @@
 |||
 ?? Mar 2011, PHP 5.3.6
 - Zend Engine:
+  . Fixed bug numerous crashes due to setlocale (crash on error, pcre, mysql
+etc.) on Windows in thread safe mode. (Pierre)
   . Fixed bug #54265 (crash when variable gets reassigned in error handler).
 (Dmitry)
   . Fixed bug #54262 (Crash when assigning value to a dimension in a 
non-array).
 (Dmitry)

+
 - Phar extension:
   . Fixed bug #54247 (format-string vulnerability on Phar). (Felipe)
 (CVE-2011-1153)

-- 
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/ NEWS

[Andrey Hristov]

andrey   Thu, 17 Mar 2011 10:31:28 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309340

Log:
here comes the news

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-03-17 10:28:53 UTC (rev 309339)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-03-17 10:31:28 UTC (rev 309340)
@@ -1,6 +1,9 @@
 PHPNEWS
 |||
 ?? ??? 2011, PHP 5.3.7
+- MySQL Improved extension:
+  . Fixed Bug #54221 (mysqli::get_warnings segfault when used in multi 
queries).
+(Andrey)

 17 Mar 2011, PHP 5.3.6
 - Upgraded bundled Sqlite3 to version 3.7.4. (Ilia)

-- 
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/ NEWS

[Felipe Pena]

felipe   Thu, 17 Mar 2011 12:03:09 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309344

Log:
- BFN

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-03-17 11:59:54 UTC (rev 309343)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-03-17 12:03:09 UTC (rev 309344)
@@ -5,10 +5,17 @@
 - Zend Engine:
   . Fixed bug #54262 (Crash when assigning value to a dimension in a 
non-array).
 (Dmitry)
+
+- DBA extension:
+  . Fixed bug #54242 (dba_insert returns true if key already exists). (Felipe)

 - MySQL Improved extension:
   . Fixed Bug #54221 (mysqli::get_warnings segfault when used in multi 
queries).
 (Andrey)
+
+- PDO Dblib driver:
+  . Fixed bug #54167 (PDO_DBLIB returns null on SQLUNIQUE field).
+(mjh at hodginsmedia dot com, Felipe)

 17 Mar 2011, PHP 5.3.6
 - Upgraded bundled Sqlite3 to version 3.7.4. (Ilia)

-- 
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/ NEWS

[Felipe Pena]

felipe   Sat, 19 Mar 2011 17:47:54 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309434

Log:
- BFN

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-03-19 17:36:01 UTC (rev 309433)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-03-19 17:47:54 UTC (rev 309434)
@@ -1,7 +1,6 @@
 PHPNEWS
 |||
 ?? ??? 2011, PHP 5.3.7
-
 - Zend Engine:
   . Fixed bug #54262 (Crash when assigning value to a dimension in a 
non-array).
 (Dmitry)
@@ -21,11 +20,14 @@
   . Fixed Bug #54221 (mysqli::get_warnings segfault when used in multi 
queries).
 (Andrey)

-- PDO Dblib driver:
+- PDO DBlib driver:
   . Fixed bug #54167 (PDO_DBLIB returns null on SQLUNIQUE field).
 (mjh at hodginsmedia dot com, Felipe)

-- Sockets extension
+- SOAP extension:
+  . Fixed bug #54312 (soap_version logic bug). (tom at samplonius dot org)
+
+- Sockets extension:
   . Fixed bug #51958 (socket_accept() fails on IPv6 server sockets). (Gustavo)

 17 Mar 2011, PHP 5.3.6

-- 
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/ NEWS

[Andrey Hristov]

andrey   Thu, 24 Mar 2011 16:19:01 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309657

Log:
here comes the news

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-03-24 16:16:36 UTC (rev 309656)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-03-24 16:19:01 UTC (rev 309657)
@@ -26,6 +26,10 @@
 - MySQL Improved extension:
   . Fixed Bug #54221 (mysqli::get_warnings segfault when used in multi 
queries).
 (Andrey)
+
+- mysqlnd
+  . Fixed crash when using more than 28,000 bound parameters. Workaround is to
+set mysqlnd.net_cmd_buffer_size to at least 9000. (Andrey)

 - PDO DBlib driver:
   . Fixed bug #54167 (PDO_DBLIB returns null on SQLUNIQUE field).

-- 
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/ NEWS

[Pierre Joye]

pajoye   Mon, 28 Mar 2011 16:45:57 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309793

Log:
- not applied yet

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-03-28 16:43:49 UTC (rev 309792)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-03-28 16:45:57 UTC (rev 309793)
@@ -12,10 +12,6 @@
. Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using
  TMPDIR on Windows). (Pierre)

-- cURL extension:
-  . Add curl.cainfo ini option to set the path to a defailt CA bundle file, 
used
-by CURLOPT_CAINFO option. (Pierre)
-
 - DateTime extension:
   . Fixed bug #54340 (DateTime::add() method bug). (Adam)
   . Fixed bug #54316 (DateTime::createFromFormat does not handle trailing '|'

-- 
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/ NEWS

[Felipe Pena]

felipe   Tue, 29 Mar 2011 18:44:52 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309819

Log:
- BFN

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-03-29 18:40:20 UTC (rev 309818)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-03-29 18:44:52 UTC (rev 309819)
@@ -40,7 +40,11 @@
 - PDO PostgreSQL driver:
   . Fixed bug #54318 (Non-portable grep option used in PDO pgsql
 configuration). (bwalton at artsci dot utoronto dot ca)
-
+
+- PDO Oracle driver:
+  . Fixed bug #44989 (64bit Oracle RPMs still not supported by pdo-oci).
+(jbnance at tresgeek dot net)
+
 - Phar extension:
   . Fixed bug #54395 (Phar::mount() crashes when calling with wrong 
parameters).
 (Felipe)

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

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

[Pierre Joye]

pajoye   Thu, 31 Mar 2011 23:58:06 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309861

Log:
- fix bug #54423, fix build in trunk, introduce by previous related commit

Bug: http://bugs.php.net/54423 (Closed) classes from dl()'ed extensions are not 
destroyed
  
Changed paths:
U   php/php-src/trunk/Zend/zend_API.c

Modified: php/php-src/trunk/Zend/zend_API.c
===
--- php/php-src/trunk/Zend/zend_API.c   2011-03-31 18:56:06 UTC (rev 309860)
+++ php/php-src/trunk/Zend/zend_API.c   2011-03-31 23:58:06 UTC (rev 309861)
@@ -2210,7 +2210,7 @@

 static int clean_module_class(const zend_class_entry **ce, int *module_number 
TSRMLS_DC) /* {{{ */
 {
-   if ((*ce)->type == ZEND_INTERNAL_CLASS && (*ce)->module->module_number 
== *module_number) {
+   if ((*ce)->type == ZEND_INTERNAL_CLASS && 
(*ce)->info.internal.module->module_number == *module_number) {
return ZEND_HASH_APPLY_REMOVE;
} else {
return ZEND_HASH_APPLY_KEEP;

-- 
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/ NEWS

[Stanislav Malyshev]

stas Wed, 13 Apr 2011 17:33:00 +

Revision: http://svn.php.net/viewvc?view=revision&revision=310212

Log:
add CVE

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-04-13 16:09:10 UTC (rev 310211)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-04-13 17:33:00 UTC (rev 310212)
@@ -18,6 +18,7 @@
   . Fixed bug #54454 (substr_compare incorrectly reports equality in some
 cases). (Pierrick)
   . Fixed bug #54238 (use-after-free in substr_replace()). (Stas)
+(CVE-2011-1148)
   . Fixed bug #54180 (parse_url() incorrectly parses path when ? in fragment).
 (tomas dot brastavicius at quantum dot lt, Pierrick)
   . Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using

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