[Pkg-php-commits] [php/debian-squeeze] Fix reject-filenames-with-null-r305507.patch to not break oci8 extension

[Ondřej Surý]

---
 .../reject-filenames-with-null-r305507.patch       |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/debian/patches/reject-filenames-with-null-r305507.patch b/debian/patches/reject-filenames-with-null-r305507.patch
index befe401..18f9c69 100644
--- a/debian/patches/reject-filenames-with-null-r305507.patch
+++ b/debian/patches/reject-filenames-with-null-r305507.patch
@@ -820,7 +820,7 @@
  		}
 --- a/ext/oci8/oci8_interface.c
 +++ b/ext/oci8/oci8_interface.c
-@@ -271,6 +271,10 @@ PHP_FUNCTION(oci_lob_load)
+@@ -242,6 +242,10 @@ PHP_FUNCTION(oci_lob_import)
  			return;
  		}	
  	}
@@ -831,15 +831,6 @@
  	
  	if (zend_hash_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"), (void **)&tmp) == FAILURE) {
  		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
-@@ -662,7 +666,7 @@ PHP_FUNCTION(oci_lob_erase)
- 			RETURN_FALSE;
- 		}
- 	}
--	
-+
- 	if (zend_hash_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"), (void **)&tmp) == FAILURE) {
- 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
- 		RETURN_FALSE;
 @@ -918,6 +922,10 @@ PHP_FUNCTION(oci_lob_export)
  		/* nothing to write, fail silently */
  		RETURN_FALSE;
-- 
1.7.1