[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2007-10-06 Thread changelog
changelog   Sun Oct  7 01:31:27 2007 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2830r2=1.2831diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2830 php-src/ChangeLog:1.2831
--- php-src/ChangeLog:1.2830Sat Oct  6 01:31:29 2007
+++ php-src/ChangeLog   Sun Oct  7 01:31:26 2007
@@ -1,3 +1,38 @@
+2007-10-06  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/xsl/xsl_fe.h
+  ext/xsl/xsltprocessor.c:
+  fix ws  folding, nuke unused vars
+
+* ext/standard/file.c:
+  fix ws and avoid freeing integer vars
+
+2007-10-06  Jani Taskinen  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/ldap/ldap.c:
+  MFH:- Add support for LDAP_X_OPT_CONNECT_TIMEOUT (Netscape LDAP SDK
+  equivalent for LDAP_OPT_NETWORK_TIMEOUT)
+
+* ext/ldap/ldap.c:
+  - Add support for LDAP_X_OPT_CONNECT_TIMEOUT (Netscape LDAP SDK 
equivalent
+  for LDAP_OPT_NETWORK_TIMEOUT)
+
+* (PHP_5_3)
+  NEWS:
+  BFN
+  [DOC] Note: ldap_[get|set]_option() manual pages needs an entry for
+  [DOC] LDAP_OPT_NETWORK_TIMEOUT
+
+* (PHP_5_3)
+  ext/ldap/ldap.c:
+  MFH: - Added LDAP_OPT_NETWORK_TIMEOUT option for ldap_set_option() to 
allow
+  setting network timeout (FR#42837)
+
+* ext/ldap/ldap.c:
+  - Added LDAP_OPT_NETWORK_TIMEOUT option for ldap_set_option() to allow
+  setting network timeout
+
 2007-10-05  Andrey Hristov  [EMAIL PROTECTED]
 
 * ext/mysqlnd/mysqlnd_alloc.c


Re: [PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2007-10-06 Thread Marcus Boerger
Hello Nuno,

  do we still need to patch anything with 1.6?

marcus

Friday, October 5, 2007, 4:51:36 PM, you wrote:

 nlopess Fri Oct  5 14:51:36 2007 UTC

   Modified files:  (Branch: PHP_5_2)
 /php-srcconfigure.in 
   Log:
   allow lcov 1.6
   
 http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77r2=1.579.2.52.2.78diff_format=u
 Index: php-src/configure.in
 diff -u php-src/configure.in:1.579.2.52.2.77 
 php-src/configure.in:1.579.2.52.2.78
 --- php-src/configure.in:1.579.2.52.2.77Thu Aug 30 07:40:13 2007
 +++ php-src/configure.inFri Oct  5 14:51:36 2007
 @@ -1,4 +1,4 @@
 -## $Id: configure.in,v 1.579.2.52.2.77 2007/08/30 07:40:13 sebastian Exp $ 
 -*- autoconf -*-
 +## $Id: configure.in,v 1.579.2.52.2.78 2007/10/05 14:51:36 nlopess Exp $ -*- 
 autoconf -*-
  dnl ## Process this file with autoconf to produce a configure script.
  
  divert(1)
 @@ -646,7 +646,7 @@
  AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is
 used. You can disable ccache by setting
 environment variable CCACHE_DISABLE=1.])
fi

 -  ltp_version_list=1.5
 +  ltp_version_list=1.5 1.6
  
AC_CHECK_PROG(LTP, lcov, lcov)
AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)




Best regards,
 Marcus

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



Re: [PHP-CVS] cvs: php-src /ext/standard/tests/strings nl2br_error.phpt nl2br_variation1.phpt nl2br_variation2.phpt nl2br_variation3.phpt nl2br_variation4.phpt nl2br_variation5.phpt

2007-10-06 Thread Marcus Boerger
Hello Raghubansh,

  maybe safe a few keystrokes and go with the suggested *_001 instead or
*_variation1 style. Either way I hope you continue. If you do we sooner or
later get like 80% coverage - yeah!!

marcus

Friday, October 5, 2007, 8:47:47 PM, you wrote:

 kraghubaFri Oct  5 18:47:47 2007 UTC

   Modified files:  
 /php-src/ext/standard/tests/strings nl2br_error.phpt 
 nl2br_variation1.phpt 
 nl2br_variation2.phpt 
 nl2br_variation3.phpt 
 nl2br_variation4.phpt 
 nl2br_variation5.phpt 
   Log:
   New testcases for nl2br() function
   



Best regards,
 Marcus

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



[PHP-CVS] cvs: php-src /ext/standard file.c

2007-10-06 Thread Antony Dovgal
tony2001Sat Oct  6 21:15:46 2007 UTC

  Modified files:  
/php-src/ext/standard   file.c 
  Log:
  fix ws and avoid freeing integer vars
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.501r2=1.502diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.501 php-src/ext/standard/file.c:1.502
--- php-src/ext/standard/file.c:1.501   Wed Oct  3 10:31:04 2007
+++ php-src/ext/standard/file.c Sat Oct  6 21:15:46 2007
@@ -21,7 +21,7 @@
+--+
  */
 
-/* $Id: file.c,v 1.501 2007/10/03 10:31:04 dsp Exp $ */
+/* $Id: file.c,v 1.502 2007/10/06 21:15:46 tony2001 Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -2259,10 +2259,7 @@
 }
 /* }}} */
 
-PHPAPI void php_fgetcsv(php_stream *stream, /* {{{ */
-   char delimiter, char enclosure, 
char escape,
-   size_t buf_len, char *buf,
-   zval *return_value TSRMLS_DC)
+PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, 
char escape, size_t buf_len, char *buf, zval *return_value TSRMLS_DC) /* {{{ */
 {
char *delim = delimiter, *enc = enclosure, *buffer = buf, *esc;
int delim_len = 1, enc_len = 1, esc_len = 1, buffer_len = buf_len;
@@ -2273,7 +2270,6 @@
}
 
if (type == IS_UNICODE) {
-   UChar esc = '\\';
 
/* Unicode stream, but binary delimiter/enclosures/prefetch, 
promote to unicode */
if (FAILURE == 
zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), 
(UChar**)delim, delim_len, delimiter, 1 TSRMLS_CC)) {

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



[PHP-CVS] cvs: php-src /ext/xsl xsl_fe.h xsltprocessor.c

2007-10-06 Thread Antony Dovgal
tony2001Sat Oct  6 21:28:10 2007 UTC

  Modified files:  
/php-src/ext/xslxsl_fe.h xsltprocessor.c 
  Log:
  fix ws  folding, nuke unused vars
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsl_fe.h?r1=1.13r2=1.14diff_format=u
Index: php-src/ext/xsl/xsl_fe.h
diff -u php-src/ext/xsl/xsl_fe.h:1.13 php-src/ext/xsl/xsl_fe.h:1.14
--- php-src/ext/xsl/xsl_fe.h:1.13   Tue Oct  2 06:32:16 2007
+++ php-src/ext/xsl/xsl_fe.hSat Oct  6 21:28:10 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: xsl_fe.h,v 1.13 2007/10/02 06:32:16 chregu Exp $ */
+/* $Id: xsl_fe.h,v 1.14 2007/10/06 21:28:10 tony2001 Exp $ */
 
 #ifndef XSL_FE_H
 #define XSL_FE_H
@@ -35,3 +35,12 @@
 PHP_FUNCTION(xsl_xsltprocessor_register_php_functions);
 PHP_FUNCTION(xsl_xsltprocessor_set_profiling);
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim600: sw=4 ts=4
+ */
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.58r2=1.59diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.58 
php-src/ext/xsl/xsltprocessor.c:1.59
--- php-src/ext/xsl/xsltprocessor.c:1.58Tue Oct  2 06:32:16 2007
+++ php-src/ext/xsl/xsltprocessor.c Sat Oct  6 21:28:10 2007
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.58 2007/10/02 06:32:16 chregu Exp $ */
+/* $Id: xsltprocessor.c,v 1.59 2007/10/06 21:28:10 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -48,7 +48,6 @@
{NULL, NULL, NULL}
 };
 
-/* {{{ attribute protos, not implemented yet */
 /* {{{ php_xsl_xslt_string_to_xpathexpr()
Translates a string to a XPath Expression */
 static char *php_xsl_xslt_string_to_xpathexpr(const char *str TSRMLS_DC)
@@ -73,7 +72,7 @@
}
return (char *) value;
 }
-
+/* }}} */
 
 /* {{{ php_xsl_xslt_make_params()
Translates a PHP array to a libxslt parameters array */
@@ -124,8 +123,7 @@
 }
 /* }}} */
 
-
-static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int 
type)
+static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int 
type) /* {{{ */
 {
xsltTransformContextPtr tctxt;
zval **args;
@@ -315,17 +313,19 @@
efree(fci.params);
}
 }
+/* }}} */
 
-void xsl_ext_function_string_php(xmlXPathParserContextPtr ctxt, int nargs)
+void xsl_ext_function_string_php(xmlXPathParserContextPtr ctxt, int nargs) /* 
{{{ */
 {
xsl_ext_function_php(ctxt, nargs, 1);
 }
+/* }}} */
 
-void xsl_ext_function_object_php(xmlXPathParserContextPtr ctxt, int nargs)
+void xsl_ext_function_object_php(xmlXPathParserContextPtr ctxt, int nargs) /* 
{{{ */
 {
xsl_ext_function_php(ctxt, nargs, 2);
 }
-
+/* }}} */
 
 /* {{{ proto void xsl_xsltprocessor_import_stylesheet(domdocument doc) U
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#
@@ -414,8 +414,7 @@
 }
 /* }}} end xsl_xsltprocessor_import_stylesheet */
 
-
-static xmlDocPtr php_xsl_apply_stylesheet(zval *id, xsl_object *intern, 
xsltStylesheetPtr style, zval *docp TSRMLS_DC)
+static xmlDocPtr php_xsl_apply_stylesheet(zval *id, xsl_object *intern, 
xsltStylesheetPtr style, zval *docp TSRMLS_DC) /* {{{ */
 {
xmlDocPtr newdocp;
xmlDocPtr doc = NULL;
@@ -514,6 +513,7 @@
return newdocp;
 
 }
+/* }}} */
 
 /* {{{ proto domdocument xsl_xsltprocessor_transform_to_doc(domnode doc) U
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#
@@ -575,7 +575,6 @@
 }
 /* }}} end xsl_xsltprocessor_transform_to_doc */
 
-
 /* {{{ proto int xsl_xsltprocessor_transform_to_uri(domdocument doc, string 
uri) U
 */
 PHP_FUNCTION(xsl_xsltprocessor_transform_to_uri)
@@ -617,7 +616,6 @@
 }
 /* }}} end xsl_xsltprocessor_transform_to_uri */
 
-
 /* {{{ proto string xsl_xsltprocessor_transform_to_xml(domdocument doc) U
 */
 PHP_FUNCTION(xsl_xsltprocessor_transform_to_xml)
@@ -656,7 +654,6 @@
 }
 /* }}} end xsl_xsltprocessor_transform_to_xml */
 
-
 /* {{{ proto bool xsl_xsltprocessor_set_parameter(string namespace, mixed name 
[, string value]) U
 */
 PHP_FUNCTION(xsl_xsltprocessor_set_parameter)
@@ -825,9 +822,7 @@
 /* {{{ proto bool xsl_xsltprocessor_set_profiling(string filename) */
 PHP_FUNCTION(xsl_xsltprocessor_set_profiling)
 {
- 
zval *id;
-   zval *array_value, **entry, *new_string;
xsl_object *intern;
char *filename;
int filename_len;
@@ -835,15 +830,11 @@
 
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() 
TSRMLS_CC, s, filename, filename_len) == SUCCESS) {
intern = (xsl_object *)zend_object_store_get_object(id 
TSRMLS_CC);
-   
intern-profiling = estrndup(filename,filename_len);
-   
RETURN_TRUE;
-   

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/xsl xsl_fe.h xsltprocessor.c

2007-10-06 Thread Antony Dovgal
tony2001Sat Oct  6 21:28:50 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/xslxsl_fe.h xsltprocessor.c 
  Log:
  MFH: fix ws  folding, nuke unused vars
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsl_fe.h?r1=1.8.2.1.2.1.2.2r2=1.8.2.1.2.1.2.3diff_format=u
Index: php-src/ext/xsl/xsl_fe.h
diff -u php-src/ext/xsl/xsl_fe.h:1.8.2.1.2.1.2.2 
php-src/ext/xsl/xsl_fe.h:1.8.2.1.2.1.2.3
--- php-src/ext/xsl/xsl_fe.h:1.8.2.1.2.1.2.2Tue Oct  2 06:31:18 2007
+++ php-src/ext/xsl/xsl_fe.hSat Oct  6 21:28:50 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: xsl_fe.h,v 1.8.2.1.2.1.2.2 2007/10/02 06:31:18 chregu Exp $ */
+/* $Id: xsl_fe.h,v 1.8.2.1.2.1.2.3 2007/10/06 21:28:50 tony2001 Exp $ */
 
 #ifndef XSL_FE_H
 #define XSL_FE_H
@@ -35,3 +35,12 @@
 PHP_FUNCTION(xsl_xsltprocessor_register_php_functions);
 PHP_FUNCTION(xsl_xsltprocessor_set_profiling);
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim600: sw=4 ts=4
+ */
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.9.2.2r2=1.39.2.2.2.9.2.3diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.2 
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.3
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.2Tue Oct  2 06:31:18 2007
+++ php-src/ext/xsl/xsltprocessor.c Sat Oct  6 21:28:50 2007
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.2 2007/10/02 06:31:18 chregu Exp $ */
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.3 2007/10/06 21:28:50 tony2001 Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -48,7 +48,6 @@
{NULL, NULL, NULL}
 };
 
-/* {{{ attribute protos, not implemented yet */
 /* {{{ php_xsl_xslt_string_to_xpathexpr()
Translates a string to a XPath Expression */
 static char *php_xsl_xslt_string_to_xpathexpr(const char *str TSRMLS_DC)
@@ -73,7 +72,7 @@
}
return (char *) value;
 }
-
+/* }}} */
 
 /* {{{ php_xsl_xslt_make_params()
Translates a PHP array to a libxslt parameters array */
@@ -123,8 +122,7 @@
 }
 /* }}} */
 
-
-static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int 
type)
+static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int 
type) /* {{{ */
 {
xsltTransformContextPtr tctxt;
zval **args;
@@ -314,17 +312,19 @@
efree(fci.params);
}
 }
+/* }}} */
 
-void xsl_ext_function_string_php(xmlXPathParserContextPtr ctxt, int nargs)
+void xsl_ext_function_string_php(xmlXPathParserContextPtr ctxt, int nargs) /* 
{{{ */
 {
xsl_ext_function_php(ctxt, nargs, 1);
 }
+/* }}} */
 
-void xsl_ext_function_object_php(xmlXPathParserContextPtr ctxt, int nargs)
+void xsl_ext_function_object_php(xmlXPathParserContextPtr ctxt, int nargs) /* 
{{{ */
 {
xsl_ext_function_php(ctxt, nargs, 2);
 }
-
+/* }}} */
 
 /* {{{ proto void xsl_xsltprocessor_import_stylesheet(domdocument doc);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#
@@ -413,8 +413,7 @@
 }
 /* }}} end xsl_xsltprocessor_import_stylesheet */
 
-
-static xmlDocPtr php_xsl_apply_stylesheet(zval *id, xsl_object *intern, 
xsltStylesheetPtr style, zval *docp TSRMLS_DC)
+static xmlDocPtr php_xsl_apply_stylesheet(zval *id, xsl_object *intern, 
xsltStylesheetPtr style, zval *docp TSRMLS_DC) /* {{{ */
 {
xmlDocPtr newdocp;
xmlDocPtr doc = NULL;
@@ -513,6 +512,7 @@
return newdocp;
 
 }
+/* }}} */
 
 /* {{{ proto domdocument xsl_xsltprocessor_transform_to_doc(domnode doc);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#
@@ -573,7 +573,6 @@
 }
 /* }}} end xsl_xsltprocessor_transform_to_doc */
 
-
 /* {{{ proto int xsl_xsltprocessor_transform_to_uri(domdocument doc, string 
uri);
 */
 PHP_FUNCTION(xsl_xsltprocessor_transform_to_uri)
@@ -605,7 +604,6 @@
 }
 /* }}} end xsl_xsltprocessor_transform_to_uri */
 
-
 /* {{{ proto string xsl_xsltprocessor_transform_to_xml(domdocument doc);
 */
 PHP_FUNCTION(xsl_xsltprocessor_transform_to_xml)
@@ -644,7 +642,6 @@
 }
 /* }}} end xsl_xsltprocessor_transform_to_xml */
 
-
 /* {{{ proto bool xsl_xsltprocessor_set_parameter(string namespace, mixed name 
[, string value]);
 */
 PHP_FUNCTION(xsl_xsltprocessor_set_parameter)
@@ -756,7 +753,6 @@
 
DOM_GET_THIS(id);

-   
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() 
TSRMLS_CC, a,  array_value) == SUCCESS) {
intern = (xsl_object *)zend_object_store_get_object(id 
TSRMLS_CC);
zend_hash_internal_pointer_reset(Z_ARRVAL_P(array_value));
@@ -793,9 +789,7 @@
 /* {{{ proto bool xsl_xsltprocessor_set_profiling(string filename) */
 PHP_FUNCTION(xsl_xsltprocessor_set_profiling)
 {
- 
zval 

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xsl xsl_fe.h xsltprocessor.c

2007-10-06 Thread Antony Dovgal
tony2001Sat Oct  6 21:35:54 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xslxsltprocessor.c xsl_fe.h 
  Log:
  MFH: fix ws  folding
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.9r2=1.39.2.2.2.10diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9 
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.10
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9Mon Jul 30 16:33:22 2007
+++ php-src/ext/xsl/xsltprocessor.c Sat Oct  6 21:35:53 2007
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.9 2007/07/30 16:33:22 rrichards Exp $ */
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.10 2007/10/06 21:35:53 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -47,7 +47,6 @@
{NULL, NULL, NULL}
 };
 
-/* {{{ attribute protos, not implemented yet */
 /* {{{ php_xsl_xslt_string_to_xpathexpr()
Translates a string to a XPath Expression */
 static char *php_xsl_xslt_string_to_xpathexpr(const char *str TSRMLS_DC)
@@ -72,7 +71,7 @@
}
return (char *) value;
 }
-
+/* }}} */
 
 /* {{{ php_xsl_xslt_make_params()
Translates a PHP array to a libxslt parameters array */
@@ -122,8 +121,7 @@
 }
 /* }}} */
 
-
-static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int 
type)
+static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int 
type) /* {{{ */
 {
xsltTransformContextPtr tctxt;
zval **args;
@@ -313,17 +311,19 @@
efree(fci.params);
}
 }
+/* }}} */
 
-void xsl_ext_function_string_php(xmlXPathParserContextPtr ctxt, int nargs)
+void xsl_ext_function_string_php(xmlXPathParserContextPtr ctxt, int nargs) /* 
{{{ */
 {
xsl_ext_function_php(ctxt, nargs, 1);
 }
+/* }}} */
 
-void xsl_ext_function_object_php(xmlXPathParserContextPtr ctxt, int nargs)
+void xsl_ext_function_object_php(xmlXPathParserContextPtr ctxt, int nargs) /* 
{{{ */
 {
xsl_ext_function_php(ctxt, nargs, 2);
 }
-
+/* }}} */
 
 /* {{{ proto void xsl_xsltprocessor_import_stylesheet(domdocument doc);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#
@@ -412,8 +412,7 @@
 }
 /* }}} end xsl_xsltprocessor_import_stylesheet */
 
-
-static xmlDocPtr php_xsl_apply_stylesheet(zval *id, xsl_object *intern, 
xsltStylesheetPtr style, zval *docp TSRMLS_DC)
+static xmlDocPtr php_xsl_apply_stylesheet(zval *id, xsl_object *intern, 
xsltStylesheetPtr style, zval *docp TSRMLS_DC) /* {{{ */
 {
xmlDocPtr newdocp;
xmlDocPtr doc = NULL;
@@ -495,6 +494,7 @@
return newdocp;
 
 }
+/* }}} */
 
 /* {{{ proto domdocument xsl_xsltprocessor_transform_to_doc(domnode doc);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#
@@ -555,7 +555,6 @@
 }
 /* }}} end xsl_xsltprocessor_transform_to_doc */
 
-
 /* {{{ proto int xsl_xsltprocessor_transform_to_uri(domdocument doc, string 
uri);
 */
 PHP_FUNCTION(xsl_xsltprocessor_transform_to_uri)
@@ -587,7 +586,6 @@
 }
 /* }}} end xsl_xsltprocessor_transform_to_uri */
 
-
 /* {{{ proto string xsl_xsltprocessor_transform_to_xml(domdocument doc);
 */
 PHP_FUNCTION(xsl_xsltprocessor_transform_to_xml)
@@ -626,7 +624,6 @@
 }
 /* }}} end xsl_xsltprocessor_transform_to_xml */
 
-
 /* {{{ proto bool xsl_xsltprocessor_set_parameter(string namespace, mixed name 
[, string value]);
 */
 PHP_FUNCTION(xsl_xsltprocessor_set_parameter)
@@ -784,3 +781,11 @@
 }
 /* }}} end xsl_xsltprocessor_has_exslt_support(); */
 
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim600: sw=4 ts=4
+ */
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsl_fe.h?r1=1.8.2.1.2.1r2=1.8.2.1.2.2diff_format=u
Index: php-src/ext/xsl/xsl_fe.h
diff -u php-src/ext/xsl/xsl_fe.h:1.8.2.1.2.1 
php-src/ext/xsl/xsl_fe.h:1.8.2.1.2.2
--- php-src/ext/xsl/xsl_fe.h:1.8.2.1.2.1Mon Jan  1 09:36:10 2007
+++ php-src/ext/xsl/xsl_fe.hSat Oct  6 21:35:53 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: xsl_fe.h,v 1.8.2.1.2.1 2007/01/01 09:36:10 sebastian Exp $ */
+/* $Id: xsl_fe.h,v 1.8.2.1.2.2 2007/10/06 21:35:53 tony2001 Exp $ */
 
 #ifndef XSL_FE_H
 #define XSL_FE_H
@@ -34,3 +34,12 @@
 PHP_FUNCTION(xsl_xsltprocessor_has_exslt_support);
 PHP_FUNCTION(xsl_xsltprocessor_register_php_functions);
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim600: sw=4 ts=4
+ */

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