summaryrefslogtreecommitdiff
path: root/ext/xsl
diff options
context:
space:
mode:
authorOndřej Surý <ondrej@sury.org>2010-01-07 13:31:53 +0100
committerOndřej Surý <ondrej@sury.org>2010-01-07 13:31:53 +0100
commit0fab6db7cac8d2be99579dd049f812a8ff98e74f (patch)
tree91f01b0d06916c78262404096bfd466b8e95e5b5 /ext/xsl
parentd3a8757891280dc6650ca7eead67830c794b0e7b (diff)
downloadphp-upstream/5.3.1.tar.gz
Imported Upstream version 5.3.1upstream/5.3.1
Diffstat (limited to 'ext/xsl')
-rw-r--r--ext/xsl/config.m42
-rw-r--r--ext/xsl/config.w322
-rw-r--r--ext/xsl/php_xsl.c2
-rw-r--r--ext/xsl/php_xsl.h2
-rw-r--r--ext/xsl/tests/documentxpath.xsl2
-rw-r--r--ext/xsl/tests/phpfunc-nostring.xsl2
-rw-r--r--ext/xsl/tests/phpfunc-undef.xsl2
-rw-r--r--ext/xsl/tests/phpfunc.xsl2
-rw-r--r--ext/xsl/tests/streamsinclude.xsl2
-rw-r--r--ext/xsl/tests/xslt.xsl2
-rw-r--r--ext/xsl/tests/xslt012.xsl2
-rw-r--r--ext/xsl/xsl_fe.h2
-rw-r--r--ext/xsl/xsltprocessor.c4
13 files changed, 14 insertions, 14 deletions
diff --git a/ext/xsl/config.m4 b/ext/xsl/config.m4
index 606963f60..84d76f069 100644
--- a/ext/xsl/config.m4
+++ b/ext/xsl/config.m4
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.11.4.2 2007/07/03 17:25:35 sniper Exp $
+dnl $Id: config.m4 242949 2007-09-26 15:44:16Z cvs2svn $
dnl
PHP_ARG_WITH(xsl, for XSL support,
diff --git a/ext/xsl/config.w32 b/ext/xsl/config.w32
index aed0c84a3..27f68a11d 100644
--- a/ext/xsl/config.w32
+++ b/ext/xsl/config.w32
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.9.6.1 2008/12/26 14:05:05 pajoye Exp $
+// $Id: config.w32 271909 2008-12-26 14:05:05Z pajoye $
// vim: ft=javascript
ARG_WITH("xsl", "xsl support", "no");
diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c
index e129655f7..4bbf59d37 100644
--- a/ext/xsl/php_xsl.c
+++ b/ext/xsl/php_xsl.c
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xsl.c,v 1.32.2.6.2.2.2.6 2008/12/31 11:15:47 sebastian Exp $ */
+/* $Id: php_xsl.c 272370 2008-12-31 11:15:49Z sebastian $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/ext/xsl/php_xsl.h b/ext/xsl/php_xsl.h
index c759d60cc..38d2c87db 100644
--- a/ext/xsl/php_xsl.h
+++ b/ext/xsl/php_xsl.h
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xsl.h,v 1.15.2.1.2.1.2.4 2008/12/31 11:15:47 sebastian Exp $ */
+/* $Id: php_xsl.h 272370 2008-12-31 11:15:49Z sebastian $ */
#ifndef PHP_XSL_H
#define PHP_XSL_H
diff --git a/ext/xsl/tests/documentxpath.xsl b/ext/xsl/tests/documentxpath.xsl
index 01035e82b..0e5c5c181 100644
--- a/ext/xsl/tests/documentxpath.xsl
+++ b/ext/xsl/tests/documentxpath.xsl
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Id: documentxpath.xsl,v 1.1 2003/10/27 15:12:20 chregu Exp $ -->
+<!-- $Id: documentxpath.xsl,v 1.1 2003-10-27 15:12:20 chregu Exp $ -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
<xsl:output method="xml" encoding="iso-8859-1" indent="no"/>
<xsl:template match="/">
diff --git a/ext/xsl/tests/phpfunc-nostring.xsl b/ext/xsl/tests/phpfunc-nostring.xsl
index 7558ebeb2..f278fafdc 100644
--- a/ext/xsl/tests/phpfunc-nostring.xsl
+++ b/ext/xsl/tests/phpfunc-nostring.xsl
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Id: phpfunc-nostring.xsl,v 1.1.2.2 2009/05/23 14:49:55 felipe Exp $ -->
+<!-- $Id: phpfunc-nostring.xsl,v 1.1.2.2 2009-05-23 14:49:55 felipe Exp $ -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:php="http://php.net/xsl"
>
diff --git a/ext/xsl/tests/phpfunc-undef.xsl b/ext/xsl/tests/phpfunc-undef.xsl
index 69db215d2..e05b03b8d 100644
--- a/ext/xsl/tests/phpfunc-undef.xsl
+++ b/ext/xsl/tests/phpfunc-undef.xsl
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Id: phpfunc-undef.xsl,v 1.1.2.2 2009/05/23 14:49:55 felipe Exp $ -->
+<!-- $Id: phpfunc-undef.xsl,v 1.1.2.2 2009-05-23 14:49:55 felipe Exp $ -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:php="http://php.net/xsl"
>
diff --git a/ext/xsl/tests/phpfunc.xsl b/ext/xsl/tests/phpfunc.xsl
index 3efb7d8b0..3031ab7c1 100644
--- a/ext/xsl/tests/phpfunc.xsl
+++ b/ext/xsl/tests/phpfunc.xsl
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Id: phpfunc.xsl,v 1.1.2.2 2009/05/23 14:49:55 felipe Exp $ -->
+<!-- $Id: phpfunc.xsl,v 1.1.2.2 2009-05-23 14:49:55 felipe Exp $ -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:php="http://php.net/xsl"
>
diff --git a/ext/xsl/tests/streamsinclude.xsl b/ext/xsl/tests/streamsinclude.xsl
index 9b1c8be42..6f8bc40ed 100644
--- a/ext/xsl/tests/streamsinclude.xsl
+++ b/ext/xsl/tests/streamsinclude.xsl
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Id: streamsinclude.xsl,v 1.1 2003/10/27 15:12:20 chregu Exp $ -->
+<!-- $Id: streamsinclude.xsl,v 1.1 2003-10-27 15:12:20 chregu Exp $ -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
<xsl:output method="xml" encoding="iso-8859-1" indent="no"/>
<xsl:include href="compress.zlib://xslt.xsl.gz"/>
diff --git a/ext/xsl/tests/xslt.xsl b/ext/xsl/tests/xslt.xsl
index 755687482..8331ccc2b 100644
--- a/ext/xsl/tests/xslt.xsl
+++ b/ext/xsl/tests/xslt.xsl
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Id: xslt.xsl,v 1.2 2003/11/29 13:01:19 chregu Exp $ -->
+<!-- $Id: xslt.xsl,v 1.2 2003-11-29 13:01:19 chregu Exp $ -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
<xsl:output method="xml" encoding="iso-8859-1" indent="no"/>
diff --git a/ext/xsl/tests/xslt012.xsl b/ext/xsl/tests/xslt012.xsl
index eb0c491da..27f413855 100644
--- a/ext/xsl/tests/xslt012.xsl
+++ b/ext/xsl/tests/xslt012.xsl
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Id: xslt012.xsl,v 1.1 2004/08/05 13:31:17 tony2001 Exp $ -->
+<!-- $Id: xslt012.xsl,v 1.1 2004-08-05 13:31:17 tony2001 Exp $ -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
<xsl:output method="xml" encoding="iso-8859-1" indent="no"/>
diff --git a/ext/xsl/xsl_fe.h b/ext/xsl/xsl_fe.h
index 28619e895..f21b89846 100644
--- a/ext/xsl/xsl_fe.h
+++ b/ext/xsl/xsl_fe.h
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xsl_fe.h,v 1.8.2.1.2.1.2.5 2008/12/31 11:15:47 sebastian Exp $ */
+/* $Id: xsl_fe.h 272370 2008-12-31 11:15:49Z sebastian $ */
#ifndef XSL_FE_H
#define XSL_FE_H
diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c
index 1345c10c6..e07bdd564 100644
--- a/ext/xsl/xsltprocessor.c
+++ b/ext/xsl/xsltprocessor.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.19 2009/06/06 02:40:49 mattwil Exp $ */
+/* $Id: xsltprocessor.c 287968 2009-09-02 13:07:44Z iliaa $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -675,7 +675,7 @@ PHP_FUNCTION(xsl_xsltprocessor_transform_to_xml)
ret = -1;
if (newdocp) {
ret = xsltSaveResultToString(&doc_txt_ptr, &doc_txt_len, newdocp, sheetp);
- if (doc_txt_ptr) {
+ if (doc_txt_ptr && doc_txt_len) {
RETVAL_STRINGL(doc_txt_ptr, doc_txt_len, 1);
xmlFree(doc_txt_ptr);
}