rpms/php/devel php-5.0.4-streamcopy.patch, NONE, 1.1 php-5.0.4-xmldom.patch, NONE, 1.1 php.spec, 1.74, 1.75

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11006

Modified Files:
	php.spec 
Added Files:
	php-5.0.4-streamcopy.patch php-5.0.4-xmldom.patch 
Log Message:
* Tue May  3 2005 Joe Orton <jorton at redhat.com> 5.0.4-9
- build simplexml_import_dom even with shared dom (#156434)
- prevent truncation of copied files to ~2Mb (#155916)
- install /usr/bin/php from CLI build alongside CGI
- enable sysvmsg extension (#142988)


php-5.0.4-streamcopy.patch:
 php_streams.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE php-5.0.4-streamcopy.patch ---

Prevent truncation of copied files to ~2Mb.

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=155916

--- php-5.0.4/main/php_streams.h.streamcopy
+++ php-5.0.4/main/php_streams.h
@@ -413,7 +413,7 @@
  * Uses mmap if the src is a plain file and at offset 0 
  * To ensure we don't take up too much memory when reading large files, set the default mmap length
  * at this many bytes */
-#define PHP_STREAM_COPY_ALL		2000000
+#define PHP_STREAM_COPY_ALL		((size_t)-1)
 
 BEGIN_EXTERN_C()
 PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest, size_t maxlen STREAMS_DC TSRMLS_DC);

php-5.0.4-xmldom.patch:
 simplexml.c |    4 ----
 1 files changed, 4 deletions(-)

--- NEW FILE php-5.0.4-xmldom.patch ---
--- php-5.0.4/ext/simplexml/simplexml.c.xmldom
+++ php-5.0.4/ext/simplexml/simplexml.c
@@ -1557,7 +1557,6 @@
 	return php_sxe_get_first_node(sxe, node TSRMLS_CC);	
 }
 
-#ifdef HAVE_DOM
 /* {{{ proto simplemxml_element simplexml_import_dom(domNode node [, string class_name])
    Get a simplexml_element object from dom to allow for processing */
 PHP_FUNCTION(simplexml_import_dom)
@@ -1610,14 +1609,11 @@
 	}
 }
 /* }}} */
-#endif
 
 function_entry simplexml_functions[] = {
 	PHP_FE(simplexml_load_file, NULL)
 	PHP_FE(simplexml_load_string, NULL)
-#ifdef HAVE_DOM
 	PHP_FE(simplexml_import_dom, NULL)
-#endif
 	{NULL, NULL, NULL}
 };
 


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- php.spec	25 Apr 2005 13:59:09 -0000	1.74
+++ php.spec	4 May 2005 09:57:47 -0000	1.75
@@ -7,7 +7,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.0.4
-Release: 8
+Release: 9
 License: The PHP License
 Group: Development/Languages
 URL: http://www.php.net/
@@ -34,11 +34,13 @@
 Patch14: php-5.0.3-sprintf.patch
 Patch16: php-5.0.3-gdheaders.patch
 Patch17: php-5.0.3-gcc4.patch
+Patch18: php-5.0.4-streamcopy.patch
 
 # Fixes for extension modules
 Patch21: php-4.3.1-odbc.patch
 Patch22: php-4.3.11-shutdown.patch
 Patch23: php-5.0.4-bug32282.patch
+Patch24: php-5.0.4-xmldom.patch
 
 # Functional changes
 Patch30: php-5.0.4-dlopen.patch
@@ -334,10 +336,12 @@
 %patch13 -p1 -b .phpize64
 %patch16 -p1 -b .gdheaders
 %patch17 -p1 -b .gcc4
+%patch18 -p1 -b .streamcopy
 
 %patch21 -p1 -b .odbc
 %patch22 -p1 -b .shutdown
 %patch23 -p1 -b .bug32282
+%patch24 -p1 -b .xmldom
 
 %patch30 -p1 -b .dlopen
 %patch31 -p1 -b .easter
@@ -426,8 +430,7 @@
 	--enable-ftp \
 	--enable-magic-quotes \
 	--enable-sockets \
-	--enable-sysvsem \
-	--enable-sysvshm \
+	--enable-sysvsem --enable-sysvshm --enable-sysvmsg \
 	--enable-track-vars \
 	--enable-trans-sid \
 	--enable-yp \
@@ -515,12 +518,13 @@
 pushd build-cgi
 make install INSTALL_ROOT=$RPM_BUILD_ROOT 
 mv $RPM_BUILD_ROOT%{_bindir}/php $RPM_BUILD_ROOT%{_bindir}/php-cgi
+# Install the CLI SAPI as /usr/bin/php
+make install-cli INSTALL_ROOT=$RPM_BUILD_ROOT
 popd
 
-# Install the Apache module and CLI
+# Install the Apache module
 pushd build-apache
 make install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT
-make install-cli INSTALL_ROOT=$RPM_BUILD_ROOT
 popd
 
 # Install the default configuration file and icons
@@ -636,6 +640,12 @@
 %endif
 
 %changelog
+* Tue May  3 2005 Joe Orton <jorton at redhat.com> 5.0.4-9
+- build simplexml_import_dom even with shared dom (#156434)
+- prevent truncation of copied files to ~2Mb (#155916)
+- install /usr/bin/php from CLI build alongside CGI
+- enable sysvmsg extension (#142988)
+
 * Mon Apr 25 2005 Joe Orton <jorton at redhat.com> 5.0.4-8
 - prevent build of builtin dba as well as shared extension