rpms/php-extras/FC-6 php-extras-5.1.6-mssql.patch, NONE, 1.1 php-extras.spec, 1.10, 1.11

[Dmitry Butskoy (buc)]

Author: buc

Update of /cvs/extras/rpms/php-extras/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27552

Modified Files:
	php-extras.spec 
Added Files:
	php-extras-5.1.6-mssql.patch 
Log Message:


php-extras-5.1.6-mssql.patch:

--- NEW FILE php-extras-5.1.6-mssql.patch ---
diff -Nrbu php-5.1.6/ext/mssql/php_mssql.c php-5.1.6-OK/ext/mssql/php_mssql.c
--- php-5.1.6/ext/mssql/php_mssql.c	2006-04-04 22:49:12.000000000 +0400
+++ php-5.1.6-OK/ext/mssql/php_mssql.c	2007-06-20 16:34:12.000000000 +0400
@@ -818,7 +818,7 @@
 
 static void php_mssql_get_column_content_with_type(mssql_link *mssql_ptr,int offset,zval *result, int column_type  TSRMLS_DC)
 {
-	if (dbdatlen(mssql_ptr->link,offset) == 0) {
+	if (dbdata(mssql_ptr->link,offset) == NULL && dbdatlen(mssql_ptr->link,offset) == 0) {
 		ZVAL_NULL(result);
 		return;
 	}


Index: php-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/php-extras/FC-6/php-extras.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- php-extras.spec	15 Jun 2007 13:14:01 -0000	1.10
+++ php-extras.spec	20 Jun 2007 12:40:42 -0000	1.11
@@ -22,7 +22,7 @@
 Summary: Additional PHP modules from the standard PHP distribution
 #Version: %(php-config --version 2>/dev/null || echo 0)
 Version: 5.1.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Development/Languages
 License: The PHP License
 URL: http://www.php.net/
@@ -31,6 +31,7 @@
 
 BuildRequires: php-devel = %{version}
 Patch1:  php-extras-5.1.2-readline.patch
+Patch2:  php-extras-5.1.6-mssql.patch
 
 
 %description
@@ -113,6 +114,7 @@
 %prep
 %setup -q -n php-%{version}
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -251,6 +253,9 @@
 
 
 %changelog
+* Wed Jun 20 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.6-4
+- add patch for mssql (#244736), a backport of some php-5.2 changes
+
 * Fri Jun 15 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.6-3
 - add --with-libdir=%%{_lib} to handle 64bit arches properly