+++ /dev/null
-diff -upr php-4.1.2/ext/domxml/config.m4 php-4.1.2-dom-xslt/ext/domxml/config.m4
---- php-4.1.2/ext/domxml/config.m4 Thu Oct 4 08:42:45 2001
-+++ php-4.1.2-dom-xslt/ext/domxml/config.m4 Fri Jan 18 08:58:47 2002
-@@ -1,5 +1,6 @@
--dnl $Id$
--dnl config.m4 for extension domxml
-+dnl
-+dnl $Id$
-+dnl
-
- AC_DEFUN(PHP_DOM_CHECK_VERSION,[
- old_CPPFLAGS=$CPPFLAGS
-@@ -20,17 +21,16 @@ AC_DEFUN(PHP_DOM_CHECK_VERSION,[
-
- PHP_ARG_WITH(dom, for DOM support,
- [ --with-dom[=DIR] Include DOM support (requires libxml >= 2.4.2).
-- DIR is the libxml install directory,
-- defaults to /usr.])
-+ DIR is the libxml install directory.])
-
- if test "$PHP_DOM" != "no"; then
-
- DOMXML_DIR_ADD=""
-- if test -r $PHP_DOM/include/libxml/tree.h; then
-- DOMXML_DIR=$PHP_DOM
-- elif test -r $PHP_DOM/include/libxml2/libxml/tree.h; then
-+ if test -r $PHP_DOM/include/libxml2/libxml/tree.h; then
- DOMXML_DIR=$PHP_DOM
- DOMXML_DIR_ADD="/libxml2"
-+ elif test -r $PHP_DOM/include/libxml/tree.h; then
-+ DOMXML_DIR=$PHP_DOM
- else
- for i in /usr/local /usr; do
- test -r $i/include/libxml/tree.h && DOMXML_DIR=$i
-@@ -63,4 +63,110 @@ if test "$PHP_DOM" != "no"; then
- AC_DEFINE(HAVE_DOMXML,1,[ ])
- PHP_EXTENSION(domxml, $ext_shared)
- PHP_SUBST(DOMXML_SHARED_LIBADD)
-+fi
-+
-+AC_DEFUN(PHP_DOM_XSLT_CHECK_VERSION,[
-+ old_CPPFLAGS=$CPPFLAGS
-+ CPPFLAGS=-I$DOMXSLT_DIR/include
-+ AC_MSG_CHECKING(for libxslt version)
-+ AC_EGREP_CPP(yes,[
-+ #include <libxslt/xsltconfig.h>
-+ #if LIBXSLT_VERSION >= 10003
-+ yes
-+ #endif
-+ ],[
-+ AC_MSG_RESULT(>= 1.0.3)
-+ ],[
-+ AC_MSG_ERROR(libxslt version 1.0.3 or greater required.)
-+ ])
-+ CPPFLAGS=$old_CPPFLAGS
-+])
-+
-+AC_DEFUN(PHP_DOM_EXSLT_CHECK_VERSION,[
-+ old_CPPFLAGS=$CPPFLAGS
-+ CPPFLAGS=-I$DOMEXSLT_DIR/include
-+ AC_MSG_CHECKING(for libexslt version)
-+ AC_EGREP_CPP(yes,[
-+ #include <libexslt/exsltconfig.h>
-+ #if LIBEXSLT_VERSION >= 600
-+ yes
-+ #endif
-+ ],[
-+ AC_MSG_RESULT(>= 1.0.3)
-+ ],[
-+ AC_MSG_ERROR(libxslt version 1.0.3 or greater required.)
-+ ])
-+ CPPFLAGS=$old_CPPFLAGS
-+])
-+
-+PHP_ARG_WITH(dom-xslt, for DOM XSLT support,
-+[ --with-dom-xslt[=DIR] Include DOM XSLT support (requires libxslt >= 1.0.3).
-+ DIR is the libxslt install directory.])
-+
-+PHP_ARG_WITH(dom-exslt, for DOM EXSLT support,
-+[ --with-dom-exslt[=DIR] Include DOM EXSLT support (requires libxslt >= 1.0.3).
-+ DIR is the libexslt install directory.])
-+
-+if test "$PHP_DOM_XSLT" != "no"; then
-+
-+ if test -r $PHP_DOM_XSLT/include/libxslt/transform.h; then
-+ DOMXSLT_DIR=$PHP_DOM_XSLT
-+ else
-+ for i in /usr/local /usr; do
-+ test -r $i/include/libxslt/transform.h && DOMXSLT_DIR=$i
-+ done
-+ fi
-+
-+ if test -z "$DOMXSLT_DIR"; then
-+ AC_MSG_RESULT(not found)
-+ AC_MSG_ERROR(Please reinstall the libxslt >= 1.0.3 distribution)
-+ fi
-+
-+ PHP_DOM_XSLT_CHECK_VERSION
-+
-+ PHP_ADD_LIBRARY_WITH_PATH(xslt, $DOMXSLT_DIR/lib, DOMXML_SHARED_LIBADD)
-+
-+ PHP_ADD_INCLUDE($DOMXSLT_DIR/include)
-+
-+ if test "$PHP_DOM" = "no"; then
-+ AC_MSG_ERROR(DOMXSLT requires DOMXML. Use --with-dom=<DIR>)
-+ fi
-+
-+ AC_DEFINE(HAVE_DOMXSLT,1,[ ])
-+
-+ PHP_SUBST(DOMXML_SHARED_LIBADD)
-+fi
-+
-+if test "$PHP_DOM_EXSLT" != "no"; then
-+ if test "$PHP_DOM" = "no"; then
-+ AC_MSG_ERROR(DOMEXSLT requires DOMXML. Use --with-dom=<DIR>)
-+ fi
-+
-+ if test "$PHP_DOM_XSLT" = "no"; then
-+ AC_MSG_ERROR(DOMEXSLT requires DOMXSLT. Use --with-dom-xslt=<DIR>)
-+ fi
-+
-+ if test -r $PHP_DOM_EXSLT/include/libexslt/exslt.h; then
-+ DOMEXSLT_DIR=$PHP_DOM_EXSLT
-+ else
-+ for i in /usr/local /usr; do
-+ test -r $i/include/libexslt/exslt.h && DOMEXSLT_DIR=$i
-+ done
-+ fi
-+
-+ if test -z "$DOMEXSLT_DIR"; then
-+ AC_MSG_RESULT(not found)
-+ AC_MSG_ERROR(Please reinstall the libxslt >= 1.0.3 distribution)
-+ fi
-+
-+ PHP_DOM_EXSLT_CHECK_VERSION
-+
-+ PHP_ADD_LIBRARY_WITH_PATH(exslt, $DOMEXSLT_DIR/lib, DOMXML_SHARED_LIBADD)
-+
-+ PHP_ADD_INCLUDE($DOMEXSLT_DIR/include)
-+
-+ AC_DEFINE(HAVE_DOMEXSLT,1,[ ])
-+
-+ PHP_SUBST(DOMXML_SHARED_LIBADD)
-+
- fi
-diff -upr php-4.1.2/ext/domxml/php_domxml.c php-4.1.2-dom-xslt/ext/domxml/php_domxml.c
---- php-4.1.2/ext/domxml/php_domxml.c Fri Dec 14 11:45:46 2001
-+++ php-4.1.2-dom-xslt/ext/domxml/php_domxml.c Tue Feb 26 17:03:46 2002
-@@ -16,7 +16,11 @@
- +----------------------------------------------------------------------+
- */
-
--/* $Id$ */
-+/* $Id$ */
-+
-+/* TODO
-+ * - Support Notation Nodes
-+ * */
-
-
- #ifdef HAVE_CONFIG_H
-@@ -33,7 +37,7 @@
-
- /* General macros used by domxml */
- #define DOMXML_DOMOBJ_NEW(zval, obj, ret) if (NULL == (zval = php_domobject_new(obj, ret TSRMLS_CC))) { \
-- php_error(E_WARNING, "%s() cannot create required DOM object", \
-+ php_error(E_WARNING, "%s(): cannot create required DOM object", \
- get_active_function_name(TSRMLS_C)); \
- RETURN_FALSE; \
- }
-@@ -46,13 +50,13 @@
- DOMXML_RET_ZVAL(zval);
-
- #define DOMXML_GET_THIS(zval) if (NULL == (zval = getThis())) { \
-- php_error(E_WARNING, "%s() underlying object missing", \
-+ php_error(E_WARNING, "%s(): underlying object missing", \
- get_active_function_name(TSRMLS_C)); \
- RETURN_FALSE; \
- }
-
- #define DOMXML_GET_OBJ(ret, zval, le) if (NULL == (ret = php_dom_get_object(zval, le, 0 TSRMLS_CC))) { \
-- php_error(E_WARNING, "%s() cannot fetch DOM object", \
-+ php_error(E_WARNING, "%s(): cannot fetch DOM object", \
- get_active_function_name(TSRMLS_C)); \
- RETURN_FALSE; \
- }
-@@ -80,6 +84,17 @@
- } \
- DOMXML_GET_OBJ(ret, zval, le);
-
-+#define DOMXML_PARAM_ONE(ret, zval, le, s, p1) if (NULL == (zval = getThis())) { \
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o"s, &zval, p1) == FAILURE) { \
-+ return; \
-+ } \
-+ } else { \
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, p1) == FAILURE) { \
-+ return; \
-+ } \
-+ } \
-+ DOMXML_GET_OBJ(ret, zval, le);
-+
- #define DOMXML_PARAM_TWO(ret, zval, le, s, p1, p2) if (NULL == (zval = getThis())) { \
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o"s, &zval, p1, p2) == FAILURE) { \
- return; \
-@@ -91,6 +106,18 @@
- } \
- DOMXML_GET_OBJ(ret, zval, le);
-
-+#define DOMXML_PARAM_THREE(ret, zval, le, s, p1, p2, p3) if (NULL == (zval = getThis())) { \
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o"s, &zval, p1, p2, p3) == FAILURE) { \
-+ return; \
-+ } \
-+ } else { \
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, p1, p2, p3) == FAILURE) { \
-+ return; \
-+ } \
-+ } \
-+ DOMXML_GET_OBJ(ret, zval, le);
-+
-+
- #define DOMXML_PARAM_FOUR(ret, zval, le, s, p1, p2, p3, p4) if (NULL == (zval = getThis())) { \
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o"s, &zval, p1, p2, p3, p4) == FAILURE) { \
- return; \
-@@ -102,6 +129,7 @@
- } \
- DOMXML_GET_OBJ(ret, zval, le);
-
-+
- static int le_domxmldocp;
- static int le_domxmldoctypep;
- static int le_domxmldtdp;
-@@ -116,6 +144,9 @@ static int le_domxmlnotationp;
- /*static int le_domxmlentityp;*/
- static int le_domxmlentityrefp;
- /*static int le_domxmlnsp;*/
-+#if HAVE_DOMXSLT
-+static int le_domxsltstylesheetp;
-+#endif
-
- #if defined(LIBXML_XPATH_ENABLED)
- static int le_xpathctxp;
-@@ -140,6 +171,9 @@ zend_class_entry *domxmlns_class_entry;
- zend_class_entry *xpathctx_class_entry;
- zend_class_entry *xpathobject_class_entry;
- #endif
-+#if HAVE_DOMXSLT
-+zend_class_entry *domxsltstylesheet_class_entry;
-+#endif
-
-
- static int node_attributes(zval **attributes, xmlNode *nodep TSRMLS_DC);
-@@ -149,28 +183,48 @@ static zend_function_entry domxml_functi
- PHP_FE(domxml_version, NULL)
- PHP_FE(xmldoc, NULL)
- PHP_FE(xmldocfile, NULL)
-+#if defined(LIBXML_HTML_ENABLED)
-+ PHP_FE(html_doc, NULL)
-+ PHP_FE(html_doc_file, NULL)
-+#endif
- PHP_FE(xmltree, NULL)
-+ PHP_FE(domxml_substitute_entities_default, NULL)
- PHP_FE(domxml_add_root, NULL)
-- PHP_FE(domxml_dumpmem, NULL)
-+ PHP_FE(domxml_dump_mem, NULL)
-+ PHP_FE(domxml_dump_mem_file, NULL)
-+ PHP_FE(domxml_dump_node, NULL)
-+#if defined(LIBXML_HTML_ENABLED)
-+ PHP_FE(domxml_html_dump_mem, NULL)
-+#endif
- PHP_FE(domxml_node_attributes, NULL)
- PHP_FE(domxml_elem_get_attribute, NULL)
- PHP_FE(domxml_elem_set_attribute, NULL)
- PHP_FE(domxml_node_children, NULL)
-+ PHP_FE(domxml_node_has_attributes, NULL)
- PHP_FE(domxml_node_new_child, NULL)
- PHP_FE(domxml_node, NULL)
- PHP_FE(domxml_node_unlink_node, NULL)
- PHP_FE(domxml_node_set_content, NULL)
-+ PHP_FE(domxml_node_get_content, NULL)
- PHP_FE(domxml_new_xmldoc, NULL)
-
- #if defined(LIBXML_XPATH_ENABLED)
- PHP_FE(xpath_new_context, NULL)
- PHP_FE(xpath_eval, NULL)
- PHP_FE(xpath_eval_expression, NULL)
-+ PHP_FE(xpath_register_ns, NULL)
- #endif
- #if defined(LIBXML_XPTR_ENABLED)
- PHP_FE(xptr_new_context, NULL)
- PHP_FE(xptr_eval, NULL)
- #endif
-+#if HAVE_DOMXSLT
-+ PHP_FE(domxml_xslt_version, NULL)
-+ PHP_FE(domxml_xslt_stylesheet, NULL)
-+ PHP_FE(domxml_xslt_stylesheet_doc, NULL)
-+ PHP_FE(domxml_xslt_stylesheet_file, NULL)
-+ PHP_FE(domxml_xslt_process, NULL)
-+#endif
-
- PHP_FALIAS(domxml_root, domxml_doc_document_element, NULL)
- PHP_FALIAS(domxml_attributes, domxml_node_attributes, NULL)
-@@ -183,6 +237,8 @@ static zend_function_entry domxml_functi
- PHP_FALIAS(domxml_unlink_node, domxml_node_unlink_node, NULL)
- PHP_FALIAS(set_content, domxml_node_set_content, NULL)
- PHP_FALIAS(new_xmldoc, domxml_new_xmldoc, NULL)
-+ PHP_FALIAS(domxml_dumpmem, domxml_dump_mem, NULL)
-+
- {NULL, NULL, NULL}
- };
-
-@@ -206,7 +262,12 @@ static function_entry php_domxmldoc_clas
- PHP_FALIAS(add_root, domxml_add_root, NULL)
- PHP_FALIAS(imported_node, domxml_doc_imported_node, NULL)
- PHP_FALIAS(dtd, domxml_intdtd, NULL)
-- PHP_FALIAS(dumpmem, domxml_dumpmem, NULL)
-+ PHP_FALIAS(dumpmem, domxml_dump_mem, NULL)
-+ PHP_FALIAS(dump_mem, domxml_dump_mem, NULL)
-+ PHP_FALIAS(dump_mem_file, domxml_dump_mem_file, NULL)
-+#if defined(LIBXML_HTML_ENABLED)
-+ PHP_FALIAS(html_dump_mem, domxml_html_dump_mem, NULL)
-+#endif
- #if defined(LIBXML_XPATH_ENABLED)
- PHP_FALIAS(xpath_init, xpath_init, NULL)
- PHP_FALIAS(xpath_new_context, xpath_new_context, NULL)
-@@ -217,13 +278,13 @@ static function_entry php_domxmldoc_clas
-
- static function_entry php_domxmldoctype_class_functions[] = {
- PHP_FALIAS(name, domxml_doctype_name, NULL)
--/*
-+/*
- PHP_FALIAS(entities, domxml_doctype_entities, NULL)
- PHP_FALIAS(notations, domxml_doctype_notations, NULL)
- PHP_FALIAS(system_id, domxml_doctype_system_id, NULL)
- PHP_FALIAS(public_id, domxml_doctype_public_id, NULL)
- PHP_FALIAS(internal_subset, domxml_doctype_internal_subset, NULL)
--*/
-+*/
- {NULL, NULL, NULL}
- };
-
-@@ -249,16 +310,20 @@ static zend_function_entry php_domxmlnod
- PHP_FALIAS(owner_document, domxml_node_owner_document, NULL)
- PHP_FALIAS(new_child, domxml_node_new_child, NULL)
- PHP_FALIAS(attributes, domxml_node_attributes, NULL)
-+ PHP_FALIAS(has_attributes, domxml_node_has_attributes, NULL)
- PHP_FALIAS(node, domxml_node, NULL)
- PHP_FALIAS(unlink, domxml_node_unlink_node, NULL)
-+ PHP_FALIAS(replace_node, domxml_node_replace_node, NULL)
- PHP_FALIAS(set_content, domxml_node_set_content, NULL)
-+ PHP_FALIAS(get_content, domxml_node_get_content, NULL)
- PHP_FALIAS(text_concat, domxml_node_text_concat, NULL)
- PHP_FALIAS(set_name, domxml_node_set_name, NULL)
- PHP_FALIAS(node_name, domxml_node_name, NULL)
- PHP_FALIAS(node_type, domxml_node_type, NULL)
- PHP_FALIAS(node_value, domxml_node_value, NULL)
- PHP_FALIAS(clone_node, domxml_clone_node, NULL)
-- PHP_FALIAS(is_blank_node, domxml_is_blank_node, NULL)
-+ PHP_FALIAS(is_blank_node, domxml_is_blank_node, NULL)
-+ PHP_FALIAS(dump_node, domxml_dump_node, NULL)
- {NULL, NULL, NULL}
- };
-
-@@ -299,7 +364,7 @@ static zend_function_entry php_domxmlent
- };
-
- static zend_function_entry php_domxmlentity_class_functions[] = {
--/*
-+/*
- PHP_FALIAS(public_id, domxml_entity_public_id, NULL)
- PHP_FALIAS(system_id, domxml_entity_system_id, NULL)
- PHP_FALIAS(notation_name, domxml_entity_notation_name, NULL)
-@@ -317,6 +382,7 @@ static zend_function_entry php_domxmlpi_
- static zend_function_entry php_xpathctx_class_functions[] = {
- PHP_FALIAS(xpath_eval, xpath_eval, NULL)
- PHP_FALIAS(xpath_eval_expression, xpath_eval_expression, NULL)
-+ PHP_FALIAS(xpath_register_ns, xpath_register_ns, NULL)
- {NULL, NULL, NULL}
- };
-
-@@ -329,7 +395,7 @@ static zend_function_entry php_domxmlatt
- PHP_FALIAS(name, domxml_attr_name, NULL)
- PHP_FALIAS(value, domxml_attr_value, NULL)
- PHP_FALIAS(specified, domxml_attr_specified, NULL)
--/*
-+/*
- PHP_FALIAS(owner_element, domxml_attr_owner_element, NULL)
- */
- {NULL, NULL, NULL}
-@@ -339,8 +405,16 @@ static zend_function_entry php_domxmlns_
- {NULL, NULL, NULL}
- };
-
-+#if HAVE_DOMXSLT
-+static zend_function_entry php_domxsltstylesheet_class_functions[] = {
-+/* TODO: maybe some more methods? */
-+ PHP_FALIAS(process, domxml_xslt_process, NULL)
-+ {NULL, NULL, NULL}
-+};
-+#endif
-+
- zend_module_entry domxml_module_entry = {
-- STANDARD_MODULE_HEADER,
-+ STANDARD_MODULE_HEADER,
- "domxml",
- domxml_functions,
- PHP_MINIT(domxml),
-@@ -348,7 +422,7 @@ zend_module_entry domxml_module_entry =
- PHP_RINIT(domxml),
- NULL,
- PHP_MINFO(domxml),
-- NO_VERSION_YET,
-+ NO_VERSION_YET,
- STANDARD_MODULE_PROPERTIES
- };
-
-@@ -370,14 +444,14 @@ static void dom_object_set_data(void *ob
-
- static zval *dom_object_get_data(void *obj)
- {
--/*
-+/*
- char tmp[20];
- sprintf(tmp, "%08X", obj);
- fprintf(stderr, "Trying getting %s from object ...", tmp);
- if(((xmlNodePtr) obj)->_private)
- fprintf(stderr, " found\n");
- else
-- fprintf(stderr, " not found\n");
-+ fprintf(stderr, " not found\n");
- */
- return ((zval *) (((xmlNodePtr) obj)->_private));
- }
-@@ -411,9 +485,14 @@ static inline void node_list_wrapper_dto
- {
- while (node != NULL) {
- node_list_wrapper_dtor(node->children);
-- // FIXME temporary fix; think of something better
-- if (node->type != XML_ATTRIBUTE_DECL && node->type != XML_DTD_NODE) {
-- attr_list_wrapper_dtor(node->properties);
-+ switch (node->type) {
-+ /* Skip property freeing for the following types */
-+ case XML_ATTRIBUTE_DECL:
-+ case XML_DTD_NODE:
-+ case XML_ENTITY_DECL:
-+ break;
-+ default:
-+ attr_list_wrapper_dtor(node->properties);
- }
- node_wrapper_dtor(node);
- node = node->next;
-@@ -474,6 +553,92 @@ static void php_free_xpath_object(zend_r
- #endif
-
-
-+#if HAVE_DOMXSLT
-+static void php_free_xslt_stylesheet(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-+{
-+ xsltStylesheetPtr sheet = (xsltStylesheetPtr) rsrc->ptr;
-+
-+ if (sheet) {
-+ node_wrapper_dtor((xmlNodePtr) sheet);
-+ xsltFreeStylesheet(sheet);
-+ }
-+}
-+
-+static void xsltstylesheet_set_data(void *obj, zval *wrapper)
-+{
-+/*
-+ char tmp[20];
-+ sprintf(tmp, "%08X", obj);
-+ fprintf(stderr, "Adding %s to hash\n", tmp);
-+*/
-+ ((xsltStylesheetPtr) obj)->_private = wrapper;
-+}
-+
-+
-+static zval *xsltstylesheet_get_data(void *obj)
-+{
-+/*
-+ char tmp[20];
-+ sprintf(tmp, "%08X", obj);
-+ fprintf(stderr, "Trying getting %s from object ...", tmp);
-+ if(((xmlNodePtr) obj)->_private)
-+ fprintf(stderr, " found\n");
-+ else
-+ fprintf(stderr, " not found\n");
-+*/
-+ return ((zval *) (((xsltStylesheetPtr) obj)->_private));
-+}
-+
-+void *php_xsltstylesheet_get_object(zval *wrapper, int rsrc_type1, int rsrc_type2 TSRMLS_DC)
-+{
-+ void *obj;
-+ zval **handle;
-+ int type;
-+
-+ if (NULL == wrapper) {
-+ php_error(E_WARNING, "xsltstylesheet_get_object() invalid wrapper object passed");
-+ return NULL;
-+ }
-+
-+ if (Z_TYPE_P(wrapper) != IS_OBJECT) {
-+ php_error(E_WARNING, "%s(): wrapper is not an object", get_active_function_name(TSRMLS_C));
-+ return NULL;
-+ }
-+
-+ if (zend_hash_index_find(Z_OBJPROP_P(wrapper), 0, (void **) &handle) == FAILURE) {
-+ php_error(E_WARNING, "%s(): underlying object missing", get_active_function_name(TSRMLS_C));
-+ return NULL;
-+ }
-+
-+ obj = zend_list_find(Z_LVAL_PP(handle), &type);
-+ if (!obj || ((type != rsrc_type1) && (type != rsrc_type2))) {
-+ php_error(E_WARNING, "%s(): underlying object missing or of invalid type", get_active_function_name(TSRMLS_C));
-+ return NULL;
-+ }
-+
-+ return obj;
-+}
-+
-+static void php_xsltstylesheet_set_object(zval *wrapper, void *obj, int rsrc_type)
-+{
-+ zval *handle, *addr;
-+
-+ MAKE_STD_ZVAL(handle);
-+ Z_TYPE_P(handle) = IS_LONG;
-+ Z_LVAL_P(handle) = zend_list_insert(obj, rsrc_type);
-+
-+ MAKE_STD_ZVAL(addr);
-+ Z_TYPE_P(addr) = IS_LONG;
-+ Z_LVAL_P(addr) = (int) obj;
-+
-+ zend_hash_index_update(Z_OBJPROP_P(wrapper), 0, &handle, sizeof(zval *), NULL);
-+ zend_hash_index_update(Z_OBJPROP_P(wrapper), 1, &addr, sizeof(zval *), NULL);
-+ zval_add_ref(&wrapper);
-+ xsltstylesheet_set_data(obj, wrapper);
-+}
-+#endif /* HAVE_DOMXSLT */
-+
-+
- void *php_xpath_get_object(zval *wrapper, int rsrc_type1, int rsrc_type2 TSRMLS_DC)
- {
- void *obj;
-@@ -486,18 +651,18 @@ void *php_xpath_get_object(zval *wrapper
- }
-
- if (Z_TYPE_P(wrapper) != IS_OBJECT) {
-- php_error(E_WARNING, "%s() wrapper is not an object", get_active_function_name(TSRMLS_C));
-+ php_error(E_WARNING, "%s(): wrapper is not an object", get_active_function_name(TSRMLS_C));
- return NULL;
- }
-
- if (zend_hash_index_find(Z_OBJPROP_P(wrapper), 0, (void **) &handle) == FAILURE) {
-- php_error(E_WARNING, "%s() underlying object missing", get_active_function_name(TSRMLS_C));
-+ php_error(E_WARNING, "%s(): underlying object missing", get_active_function_name(TSRMLS_C));
- return NULL;
- }
-
- obj = zend_list_find(Z_LVAL_PP(handle), &type);
- if (!obj || ((type != rsrc_type1) && (type != rsrc_type2))) {
-- php_error(E_WARNING, "%s() underlying object missing or of invalid type", get_active_function_name(TSRMLS_C));
-+ php_error(E_WARNING, "%s(): underlying object missing or of invalid type", get_active_function_name(TSRMLS_C));
- return NULL;
- }
-
-@@ -507,7 +672,7 @@ void *php_xpath_get_object(zval *wrapper
-
- static void xpath_object_set_data(void *obj, zval *wrapper)
- {
--/*
-+/*
- char tmp[20];
- sprintf(tmp, "%08X", obj);
- fprintf(stderr, "Adding %s to hash\n", tmp);
-@@ -518,12 +683,12 @@ static void xpath_object_set_data(void *
-
- static zval *xpath_object_get_data(void *obj)
- {
--/*
-+/*
- char tmp[20];
- sprintf(tmp, "%08X", obj);
-- fprintf(stderr, "Trying getting %s from hash ...", tmp);
-+ fprintf(stderr, "Trying getting %s from hash ...", tmp);
- if(((xmlXPathObjectPtr) obj)->user)
-- fprintf(stderr, " found\n");
-+ fprintf(stderr, " found\n");
- else
- fprintf(stderr, " not found\n");
- */
-@@ -574,7 +739,7 @@ static zval *php_xpathobject_new(xmlXPat
-
- /*
- rsrc_type = le_xpathobjectp;
-- php_xpath_set_object(wrapper, (void *) obj, rsrc_type);
-+ php_xpath_set_object(wrapper, (void *) obj, rsrc_type);
- */
-
- php_xpath_set_object(wrapper, (void *) obj, le_xpathobjectp);
-@@ -594,19 +759,19 @@ void *php_xpath_get_context(zval *wrappe
- }
-
- if (Z_TYPE_P(wrapper) != IS_OBJECT) {
-- php_error(E_WARNING, "%s() wrapper is not an object", get_active_function_name(TSRMLS_C));
-+ php_error(E_WARNING, "%s(): wrapper is not an object", get_active_function_name(TSRMLS_C));
- return NULL;
- }
-
- if (zend_hash_index_find(Z_OBJPROP_P(wrapper), 0, (void **) &handle) ==
- FAILURE) {
-- php_error(E_WARNING, "%s() underlying object missing", get_active_function_name(TSRMLS_C));
-+ php_error(E_WARNING, "%s(): underlying object missing", get_active_function_name(TSRMLS_C));
- return NULL;
- }
-
- obj = zend_list_find(Z_LVAL_PP(handle), &type);
- if (!obj || ((type != rsrc_type1) && (type != rsrc_type2))) {
-- php_error(E_WARNING, "%s() Underlying object missing or of invalid type", get_active_function_name(TSRMLS_C));
-+ php_error(E_WARNING, "%s(): underlying object missing or of invalid type", get_active_function_name(TSRMLS_C));
- return NULL;
- }
-
-@@ -628,9 +793,9 @@ static zval *xpath_context_get_data(void
- /*
- char tmp[20];
- sprintf(tmp, "%08X", obj);
-- fprintf(stderr, "Trying getting %s from hash ...", tmp);
-+ fprintf(stderr, "Trying getting %s from hash ...", tmp);
- if(((xmlXPathContextPtr) obj)->user)
-- fprintf(stderr, " found\n");
-+ fprintf(stderr, " found\n");
- else
- fprintf(stderr, " not found\n");
- */
-@@ -661,7 +826,7 @@ static zval *php_xpathcontext_new(xmlXPa
- int rsrc_type;
-
- if (! found) {
-- *found = 0;
-+ *found = 0;
- }
-
- if (!obj) {
-@@ -677,8 +842,8 @@ static zval *php_xpathcontext_new(xmlXPa
- }
-
- MAKE_STD_ZVAL(wrapper);
--/*
-- fprintf(stderr, "Adding new XPath Context\n");
-+/*
-+ fprintf(stderr, "Adding new XPath Context\n");
- */
- object_init_ex(wrapper, xpathctx_class_entry);
- rsrc_type = le_xpathctxp;
-@@ -700,12 +865,12 @@ void *php_dom_get_object(zval *wrapper,
- }
-
- if (Z_TYPE_P(wrapper) != IS_OBJECT) {
-- php_error(E_WARNING, "%s() wrapper is not an object", get_active_function_name(TSRMLS_C));
-+ php_error(E_WARNING, "%s(): wrapper is not an object", get_active_function_name(TSRMLS_C));
- return NULL;
- }
-
- if (zend_hash_index_find(Z_OBJPROP_P(wrapper), 0, (void **) &handle) == FAILURE) {
-- php_error(E_WARNING, "%s() underlying object missing", get_active_function_name(TSRMLS_C));
-+ php_error(E_WARNING, "%s(): underlying object missing", get_active_function_name(TSRMLS_C));
- return NULL;
- }
-
-@@ -713,7 +878,7 @@ void *php_dom_get_object(zval *wrapper,
-
- /* The following test should be replaced with search in all parents */
- if (!obj) { /* || ((type != rsrc_type1) && (type != rsrc_type2))) { */
-- php_error(E_WARNING, "%s() underlying object missing or of invalid type", get_active_function_name(TSRMLS_C));
-+ php_error(E_WARNING, "%s(): underlying object missing or of invalid type", get_active_function_name(TSRMLS_C));
- return NULL;
- }
-
-@@ -747,7 +912,7 @@ static zval *php_domobject_new(xmlNodePt
- int rsrc_type;
-
- if (! found) {
-- *found = 0;
-+ *found = 0;
- }
-
- if (!obj) {
-@@ -795,8 +960,10 @@ static zval *php_domobject_new(xmlNodePt
- object_init_ex(wrapper, domxmlcomment_class_entry);
- rsrc_type = le_domxmlcommentp;
- content = xmlNodeGetContent(nodep);
-- if (content)
-+ if (content) {
-+ add_property_long(wrapper, "type", Z_TYPE_P(nodep));
- add_property_stringl(wrapper, "content", (char *) content, strlen(content), 1);
-+ }
- break;
- }
-
-@@ -817,7 +984,6 @@ static zval *php_domobject_new(xmlNodePt
- xmlNodePtr nodep = obj;
- object_init_ex(wrapper, domxmlentityref_class_entry);
- rsrc_type = le_domxmlentityrefp;
-- content = xmlNodeGetContent(nodep);
- add_property_stringl(wrapper, "name", (char *) nodep->name, strlen(nodep->name), 1);
- break;
- }
-@@ -851,8 +1017,10 @@ static zval *php_domobject_new(xmlNodePt
- }
-
- case XML_DOCUMENT_NODE:
-+ case XML_HTML_DOCUMENT_NODE:
- {
- xmlDocPtr docp = (xmlDocPtr) obj;
-+
- object_init_ex(wrapper, domxmldoc_class_entry);
- rsrc_type = le_domxmldocp;
- if (docp->name)
-@@ -863,7 +1031,10 @@ static zval *php_domobject_new(xmlNodePt
- add_property_stringl(wrapper, "url", (char *) docp->URL, strlen(docp->URL), 1);
- else
- add_property_stringl(wrapper, "url", "", 0, 1);
-- add_property_stringl(wrapper, "version", (char *) docp->version, strlen(docp->version), 1);
-+ if (docp->version)
-+ add_property_stringl(wrapper, "version", (char *) docp->version, strlen(docp->version), 1);
-+ else
-+ add_property_stringl(wrapper, "version", "", 0, 1);
- if (docp->encoding)
- add_property_stringl(wrapper, "encoding", (char *) docp->encoding, strlen(docp->encoding), 1);
- add_property_long(wrapper, "standalone", docp->standalone);
-@@ -900,8 +1071,8 @@ static zval *php_domobject_new(xmlNodePt
- break;
- }
-
-- default:
-- php_error(E_WARNING, "%s() unsupported node type: %d\n", get_active_function_name(TSRMLS_C), Z_TYPE_P(obj));
-+ default:
-+ php_error(E_WARNING, "%s(): unsupported node type: %d\n", get_active_function_name(TSRMLS_C), Z_TYPE_P(obj));
- FREE_ZVAL(wrapper);
- return NULL;
- }
-@@ -911,6 +1082,17 @@ static zval *php_domobject_new(xmlNodePt
- }
-
-
-+static void domxml_error(void *ctx, const char *msg, ...)
-+{
-+ char buf[1024];
-+ va_list ap;
-+ va_start(ap, msg);
-+ vsnprintf(buf, 1024, msg, ap);
-+ va_end(ap);
-+ php_error(E_WARNING, buf);
-+}
-+
-+
- PHP_RINIT_FUNCTION(domxml)
- {
- return SUCCESS;
-@@ -932,12 +1114,12 @@ PHP_MINIT_FUNCTION(domxml)
- le_domxmlelementp = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domelement", module_number);
- le_domxmldtdp = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domdtd", module_number);
- le_domxmlcdatap = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domcdata", module_number);
-+ le_domxmlentityrefp = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domentityref", module_number);
-+ le_domxmlpip = zend_register_list_destructors_ex(php_free_xml_node, NULL, "dompi", module_number);
-
- /* Not yet initialized le_*s */
- le_domxmldoctypep = -10000;
-- le_domxmlpip = -10002;
- le_domxmlnotationp = -10003;
-- le_domxmlentityrefp = -10004;
-
- #if defined(LIBXML_XPATH_ENABLED)
- le_xpathctxp = zend_register_list_destructors_ex(php_free_xpath_context, NULL, "xpathcontext", module_number);
-@@ -946,6 +1128,10 @@ PHP_MINIT_FUNCTION(domxml)
-
- /* le_domxmlnsp = register_list_destructors(NULL, NULL); */
-
-+#if HAVE_DOMXSLT
-+ le_domxsltstylesheetp = zend_register_list_destructors_ex(php_free_xslt_stylesheet, NULL, "xsltstylesheet", module_number);
-+#endif
-+
- INIT_OVERLOADED_CLASS_ENTRY(ce, "DomNode", php_domxmlnode_class_functions, NULL, NULL, NULL);
- domxmlnode_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
-
-@@ -996,6 +1182,11 @@ PHP_MINIT_FUNCTION(domxml)
- xpathobject_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
- #endif
-
-+#if HAVE_DOMXSLT
-+ INIT_OVERLOADED_CLASS_ENTRY(ce, "XsltStylesheet", php_domxsltstylesheet_class_functions, NULL, NULL, NULL);
-+ domxsltstylesheet_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
-+#endif
-+
- REGISTER_LONG_CONSTANT("XML_ELEMENT_NODE", XML_ELEMENT_NODE, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("XML_ATTRIBUTE_NODE", XML_ATTRIBUTE_NODE, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("XML_TEXT_NODE", XML_TEXT_NODE, CONST_CS | CONST_PERSISTENT);
-@@ -1040,6 +1231,15 @@ PHP_MINIT_FUNCTION(domxml)
- REGISTER_LONG_CONSTANT("XPATH_USERS", XPATH_USERS, CONST_CS | CONST_PERSISTENT);
- #endif
-
-+ xmlSetGenericErrorFunc(xmlGenericErrorContext, (xmlGenericErrorFunc)domxml_error);
-+#if HAVE_DOMXSLT
-+ xsltSetGenericErrorFunc(xsltGenericErrorContext, (xmlGenericErrorFunc)domxml_error);
-+#if HAVE_DOMEXSLT
-+ exsltRegisterAll();
-+#endif
-+#endif
-+
-+
- return SUCCESS;
- }
-
-@@ -1065,12 +1265,24 @@ PHP_MINFO_FUNCTION(domxml)
- php_info_print_table_start();
- php_info_print_table_row(2, "DOM/XML", "enabled");
- php_info_print_table_row(2, "libxml Version", LIBXML_DOTTED_VERSION);
-+#if defined(LIBXML_HTML_ENABLED)
-+ php_info_print_table_row(2, "HTML Support", "enabled");
-+#endif
- #if defined(LIBXML_XPATH_ENABLED)
- php_info_print_table_row(2, "XPath Support", "enabled");
- #endif
- #if defined(LIBXML_XPTR_ENABLED)
- php_info_print_table_row(2, "XPointer Support", "enabled");
- #endif
-+#if HAVE_DOMXSLT
-+ php_info_print_table_row(2, "DOM/XSLT", "enabled");
-+ php_info_print_table_row(2, "libxslt Version", LIBXSLT_DOTTED_VERSION);
-+#if HAVE_DOMEXSLT
-+ php_info_print_table_row(2, "DOM/EXSLT", "enabled");
-+ php_info_print_table_row(2, "libexslt Version", LIBEXSLT_DOTTED_VERSION);
-+#endif
-+#endif
-+
- php_info_print_table_end();
- }
-
-@@ -1318,13 +1530,13 @@ PHP_FUNCTION(domxml_is_blank_node)
- PHP_FUNCTION(domxml_node_type)
- {
- zval *id;
-- xmlNode *n;
-+ xmlNode *node;
-
-- DOMXML_GET_THIS_OBJ(n, id, le_domxmlnodep);
-+ DOMXML_GET_THIS_OBJ(node, id, le_domxmlnodep);
-
- DOMXML_NO_ARGS();
-
-- RETURN_LONG(Z_TYPE_P(n));
-+ RETURN_LONG(node->type);
- }
- /* }}} */
-
-@@ -1533,7 +1745,7 @@ PHP_FUNCTION(domxml_node_parent)
- int ret;
-
- DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep);
--
-+
- DOMXML_NO_ARGS();
-
- last = nodep->parent;
-@@ -1558,7 +1770,7 @@ PHP_FUNCTION(domxml_node_children)
- /* Even if the nodep is a XML_DOCUMENT_NODE the type is at the
- same position.
- */
-- if (Z_TYPE_P(nodep) == XML_DOCUMENT_NODE)
-+ if ((Z_TYPE_P(nodep) == XML_DOCUMENT_NODE) || (Z_TYPE_P(nodep) == XML_HTML_DOCUMENT_NODE))
- last = ((xmlDoc *) nodep)->children;
- else
- last = nodep->children;
-@@ -1579,32 +1791,27 @@ PHP_FUNCTION(domxml_node_children)
- }
- /* }}} */
-
--/* {{{ proto object domxml_node_unlink_node(void)
-- Deletes node */
-+/* {{{ proto void domxml_node_unlink_node([object node])
-+ Deletes the node */
- PHP_FUNCTION(domxml_node_unlink_node)
- {
- zval *id;
- xmlNode *nodep;
-
-- DOMXML_NO_ARGS();
--
-- DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep);
--
-- DOMXML_NO_ARGS();
-+ DOMXML_PARAM_NONE(nodep, id, le_domxmlnodep);
-
- xmlUnlinkNode(nodep);
- xmlFreeNode(nodep);
- zval_dtor(id); /* This is not enough because the children won't be deleted */
-- RETURN_TRUE;
- }
- /* }}} */
-
--/* {{{ proto object domxml_node_add_child(int domnode)
-+/* {{{ proto object domxml_node_add_child(object domnode)
- Adds existing node to parent node */
- PHP_FUNCTION(domxml_node_add_child)
- {
- zval *id, *rv, *node;
-- xmlNodePtr child, nodep;
-+ xmlNodePtr child, nodep, new_child;
- int ret;
-
- DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep);
-@@ -1615,10 +1822,20 @@ PHP_FUNCTION(domxml_node_add_child)
-
- DOMXML_GET_OBJ(child, node, le_domxmlnodep);
-
-- child = xmlAddChild(nodep, child);
-+ if (child->type == XML_ATTRIBUTE_NODE) {
-+ php_error(E_WARNING, "%s(): can't add attribute node", get_active_function_name(TSRMLS_C));
-+ RETURN_FALSE;
-+ }
-+
-+ if (NULL == (new_child = xmlCopyNode(child, 1))) {
-+ php_error(E_WARNING, "%s(): unable to clone node", get_active_function_name(TSRMLS_C));
-+ RETURN_FALSE;
-+ }
-+
-+ child = xmlAddChild(nodep, new_child);
-
- if (NULL == child) {
-- php_error(E_WARNING, "%s() couldn't add child", get_active_function_name(TSRMLS_C));
-+ php_error(E_WARNING, "%s(): couldn't add child", get_active_function_name(TSRMLS_C));
- RETURN_FALSE;
- }
-
-@@ -1626,12 +1843,39 @@ PHP_FUNCTION(domxml_node_add_child)
- }
- /* }}} */
-
--/* {{{ proto object domxml_node_append_child(int domnode)
-+/* {{{ proto object domxml_node_replace_node(object domnode)
-+ Replaces one node with another node */
-+PHP_FUNCTION(domxml_node_replace_node)
-+{
-+ zval *id, *rv, *node;
-+ xmlNodePtr repnode, nodep, new_repnode;
-+ int ret;
-+
-+ DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep);
-+
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &node) == FAILURE) {
-+ return;
-+ }
-+
-+ DOMXML_GET_OBJ(repnode, node, le_domxmlnodep);
-+
-+ if (NULL == (new_repnode = xmlCopyNode(repnode, 1))) {
-+ php_error(E_WARNING, "%s(): unable to clone node", get_active_function_name(TSRMLS_C));
-+ RETURN_FALSE;
-+ }
-+
-+ repnode = xmlReplaceNode(nodep, new_repnode);
-+
-+ DOMXML_RET_OBJ(rv, repnode, &ret);
-+}
-+/* }}} */
-+
-+/* {{{ proto object domxml_node_append_child(object domnode)
- Adds node to list of children */
- PHP_FUNCTION(domxml_node_append_child)
- {
- zval *id, *rv, *node;
-- xmlNodePtr child, nodep;
-+ xmlNodePtr child, nodep, new_child;
- int ret;
-
- DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep);
-@@ -1642,11 +1886,21 @@ PHP_FUNCTION(domxml_node_append_child)
-
- DOMXML_GET_OBJ(child, node, le_domxmlnodep);
-
-+ if (child->type == XML_ATTRIBUTE_NODE) {
-+ php_error(E_WARNING, "%s(): can't append attribute node", get_active_function_name(TSRMLS_C));
-+ RETURN_FALSE;
-+ }
-+
-+ if (NULL == (new_child = xmlCopyNode(child, 1))) {
-+ php_error(E_WARNING, "%s(): unable to clone node", get_active_function_name(TSRMLS_C));
-+ RETURN_FALSE;
-+ }
-+
- // FIXME reverted xmlAddChildList; crashes
-- child = xmlAddSibling(nodep, child);
-+ child = xmlAddSibling(nodep, new_child);
-
- if (NULL == child) {
-- php_error(E_WARNING, "%s() couldn't add node", get_active_function_name(TSRMLS_C));
-+ php_error(E_WARNING, "%s(): couldn't append node", get_active_function_name(TSRMLS_C));
- RETURN_FALSE;
- }
-
-@@ -1654,7 +1908,7 @@ PHP_FUNCTION(domxml_node_append_child)
- }
- /* }}} */
-
--/* {{{ proto object domxml_node_insert_before(int newnode, int refnode)
-+/* {{{ proto object domxml_node_insert_before(object newnode, object refnode)
- Adds node in list of nodes before given node */
- PHP_FUNCTION(domxml_node_insert_before)
- {
-@@ -1674,7 +1928,7 @@ PHP_FUNCTION(domxml_node_insert_before)
- child = xmlAddPrevSibling(refp, child);
-
- if (NULL == child) {
-- php_error(E_WARNING, "%s() couldn't add newnode as the previous sibling of refnode", get_active_function_name(TSRMLS_C));
-+ php_error(E_WARNING, "%s(): couldn't add newnode as the previous sibling of refnode", get_active_function_name(TSRMLS_C));
- RETURN_FALSE;
- }
-
-@@ -1783,11 +2037,35 @@ PHP_FUNCTION(domxml_node_set_content)
- /* FIXME: Actually the property 'content' of the node has to be updated
- as well. Since 'content' should disappear sooner or later and being
- replaces by a function 'content()' I skip this for now
-- */
-+ */
- RETURN_TRUE;
- }
- /* }}} */
-
-+/* {{{ proto string domxml_node_get_content()
-+ Gets content of a node.
-+
-+ "Read the value of a node, this can be either the text carried directly by
-+this node if it's a TEXT node or the aggregate string of the values carried by
-+this node child's (TEXT and ENTITY_REF). Entity references are substituted."
-+ */
-+PHP_FUNCTION(domxml_node_get_content)
-+{
-+ zval *id;
-+ xmlNode *nodep;
-+ xmlChar *mem;
-+
-+ DOMXML_PARAM_NONE(nodep, id, le_domxmlnodep);
-+ mem = xmlNodeGetContent(nodep);
-+ if (!mem) {
-+ RETURN_FALSE;
-+ }
-+
-+ RETURN_STRING(mem,1);
-+}
-+/* }}} */
-+
-+
- /* End of Methods DomNode }}} */
-
-
-@@ -1902,7 +2180,7 @@ PHP_FUNCTION(domxml_elem_set_attribute)
-
- attr = xmlSetProp(nodep, name, value);
- if (!attr) {
-- php_error(E_WARNING, "%s() no such attribute '%s'", get_active_function_name(TSRMLS_C), name);
-+ php_error(E_WARNING, "%s(): no such attribute '%s'", get_active_function_name(TSRMLS_C), name);
- RETURN_FALSE;
- }
-
-@@ -1966,7 +2244,7 @@ PHP_FUNCTION(domxml_elem_set_attribute_n
- xmlAttr *attrp;
-
- DOMXML_NOT_IMPLEMENTED();
--
-+
- if ((ZEND_NUM_ARGS() == 1) && getParameters(ht, 1, &arg1) == SUCCESS) {
- id = getThis();
- nodep = php_dom_get_object(id, le_domxmlelementp, 0 TSRMLS_CC);
-@@ -2052,8 +2330,8 @@ PHP_FUNCTION(domxml_doc_doctype)
- Returns DomeDOMImplementation */
- PHP_FUNCTION(domxml_doc_implementation)
- {
-- zval *id;
-- xmlDocPtr docp;
-+/* zval *id;
-+ xmlDocPtr docp;*/
-
- DOMXML_NOT_IMPLEMENTED();
-
-@@ -2283,7 +2561,7 @@ PHP_FUNCTION(domxml_doc_create_processin
- }
- /* }}} */
-
--/* {{{ proto object domxml_doc_imported_node(int node, bool recursive)
-+/* {{{ proto object domxml_doc_imported_node(object node, bool recursive)
- Creates new element node */
- PHP_FUNCTION(domxml_doc_imported_node)
- {
-@@ -2311,7 +2589,7 @@ PHP_FUNCTION(domxml_doc_imported_node)
- }
- /* }}} */
-
--/* {{{ proto object domxml_dtd([int doc_handle])
-+/* {{{ proto object domxml_dtd(void)
- Returns DTD of document */
- PHP_FUNCTION(domxml_intdtd)
- {
-@@ -2331,9 +2609,9 @@ PHP_FUNCTION(domxml_intdtd)
- }
- /* }}} */
-
--/* {{{ proto string domxml_dumpmem([int doc_handle])
-+/* {{{ proto string domxml_dump_mem([object doc_handle])
- Dumps document into string */
--PHP_FUNCTION(domxml_dumpmem)
-+PHP_FUNCTION(domxml_dump_mem)
- {
- zval *id;
- xmlDoc *docp;
-@@ -2341,7 +2619,6 @@ PHP_FUNCTION(domxml_dumpmem)
- int size;
-
- DOMXML_PARAM_NONE(docp, id, le_domxmldocp);
--
- xmlDocDumpMemory(docp, &mem, &size);
- if (!size) {
- RETURN_FALSE;
-@@ -2350,6 +2627,73 @@ PHP_FUNCTION(domxml_dumpmem)
- }
- /* }}} */
-
-+/* {{{ proto int domxml_dump_mem_file([object doc_handle],filename,compressmode)
-+ Dumps document into file and uses compression if specified
-+ Returns false on error, otherwise the length of the xml-document (uncompressed)
-+ */
-+PHP_FUNCTION(domxml_dump_mem_file)
-+{
-+ zval *id;
-+ xmlDoc *docp;
-+ int file_len, bytes;
-+ int compressmode = 0;
-+ char *file;
-+ DOMXML_PARAM_THREE(docp, id, le_domxmldocp, "s|l", &file, &file_len, &compressmode);
-+
-+ xmlSetCompressMode (compressmode);
-+ bytes = xmlSaveFile(file,docp);
-+ if (bytes == -1)
-+ {
-+ RETURN_FALSE;
-+ }
-+ RETURN_LONG(bytes);
-+}
-+/* }}} */
-+
-+/* {{{ proto string domxml_dump_node([object doc_handle],object node_handle[,int format[,int level]])
-+ Dumps node into string */
-+PHP_FUNCTION(domxml_dump_node)
-+{
-+ zval *id, *nodep;
-+ xmlDocPtr docp;
-+ xmlNodePtr elementp;
-+ xmlChar *mem ;
-+ xmlBufferPtr buf;
-+ int level = 0;
-+ int format = 0;
-+
-+ DOMXML_PARAM_THREE(docp, id, le_domxmldocp,"o|ll",&nodep,&format,&level);
-+
-+ DOMXML_GET_OBJ(elementp, nodep, le_domxmlnodep);
-+
-+ if (Z_TYPE_P(elementp) == XML_DOCUMENT_NODE || Z_TYPE_P(elementp) == XML_HTML_DOCUMENT_NODE ) {
-+ php_error(E_WARNING, "%s(): cannot dump element with a document node", get_active_function_name(TSRMLS_C));
-+ RETURN_FALSE;
-+ }
-+
-+ buf = xmlBufferCreate();
-+ if (!buf)
-+ {
-+ php_error(E_WARNING, "%s(): could fetch buffer", get_active_function_name(TSRMLS_C));
-+ RETURN_FALSE;
-+ }
-+
-+ xmlNodeDump(buf, docp, elementp,level,format);
-+
-+ mem = (xmlChar*) xmlBufferContent(buf);
-+
-+ if (!mem) {
-+ xmlBufferFree(buf);
-+ RETURN_FALSE;
-+ }
-+ RETVAL_STRING(mem, 1);
-+
-+ xmlBufferFree(buf);
-+
-+}
-+/* }}} */
-+
-+
- /* {{{ proto object xmldoc(string xmldoc [, bool from_file])
- Creates DOM object of XML document */
- PHP_FUNCTION(xmldoc)
-@@ -2413,6 +2757,106 @@ PHP_FUNCTION(xmldocfile)
- }
- /* }}} */
-
-+#if defined(LIBXML_HTML_ENABLED)
-+/* {{{ proto string domxml_html_dump_mem([int doc_handle])
-+ Dumps document into string as HTML */
-+PHP_FUNCTION(domxml_html_dump_mem)
-+{
-+ zval *id;
-+ xmlDoc *docp;
-+ xmlChar *mem;
-+ int size;
-+
-+ DOMXML_PARAM_NONE(docp, id, le_domxmldocp);
-+
-+ htmlDocDumpMemory(docp, &mem, &size);
-+ if (!size) {
-+ RETURN_FALSE;
-+ }
-+ RETURN_STRINGL(mem, size, 1);
-+}
-+/* }}} */
-+
-+/* {{{ proto object html_doc(string html_doc [, bool from_file])
-+ Creates DOM object of HTML document */
-+PHP_FUNCTION(html_doc)
-+{
-+ zval *rv;
-+ xmlDoc *docp;
-+ int ret;
-+ char *buffer;
-+ int buffer_len;
-+ zend_bool from_file = 0;
-+
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &buffer, &buffer_len, &from_file) == FAILURE) {
-+ return;
-+ }
-+
-+ if (from_file) {
-+ docp = htmlParseFile(buffer, NULL);
-+ } else {
-+ docp = htmlParseDoc(buffer, NULL);
-+ }
-+ if (!docp)
-+ RETURN_FALSE;
-+
-+ DOMXML_RET_OBJ(rv, (xmlNodePtr) docp, &ret);
-+}
-+/* }}} */
-+
-+/* {{{ proto object html_doc_file(string filename)
-+ Creates DOM object of HTML document in file */
-+PHP_FUNCTION(html_doc_file)
-+{
-+ zval *rv;
-+ xmlDoc *docp;
-+ int ret, file_len;
-+ char *file;
-+
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &file, &file_len) == FAILURE) {
-+ return;
-+ }
-+
-+ docp = htmlParseFile(file, NULL);
-+ if (!docp) {
-+ RETURN_FALSE;
-+ }
-+
-+ DOMXML_RET_OBJ(rv, (xmlNodePtr) docp, &ret);
-+
-+ add_property_resource(return_value, "doc", ret);
-+ if (docp->name)
-+ add_property_stringl(return_value, "name", (char *) docp->name, strlen(docp->name), 1);
-+ if (docp->URL)
-+ add_property_stringl(return_value, "url", (char *) docp->URL, strlen(docp->URL), 1);
-+ if (docp->version)
-+ add_property_stringl(return_value, "version", (char *) docp->version, strlen(docp->version), 1);
-+/* add_property_stringl(return_value, "version", (char *) docp->version, strlen(docp->version), 1);*/
-+ if (docp->encoding)
-+ add_property_stringl(return_value, "encoding", (char *) docp->encoding, strlen(docp->encoding), 1);
-+ add_property_long(return_value, "standalone", docp->standalone);
-+ add_property_long(return_value, "type", Z_TYPE_P(docp));
-+ add_property_long(return_value, "compression", docp->compression);
-+ add_property_long(return_value, "charset", docp->charset);
-+ zend_list_addref(ret);
-+}
-+/* }}} */
-+#endif /* defined(LIBXML_HTML_ENABLED) */
-+
-+/* {{{ proto bool domxml_substitute_entities_default(bool enable)
-+ Set and return the previous value for default entity support */
-+PHP_FUNCTION(domxml_substitute_entities_default)
-+{
-+ zend_bool enable;
-+
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &enable) == FAILURE) {
-+ return;
-+ }
-+
-+ RETURN_BOOL(xmlSubstituteEntitiesDefault(enable));
-+}
-+/* }}} */
-+
- /* {{{ proto bool domxml_node_text_concat(string content)
- Add string tocontent of a node */
- PHP_FUNCTION(domxml_node_text_concat)
-@@ -2421,7 +2865,7 @@ PHP_FUNCTION(domxml_node_text_concat)
- xmlNode *nodep;
- char *content;
- int content_len;
--
-+
- DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep);
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &content, &content_len) == FAILURE) {
-@@ -2589,7 +3033,7 @@ static int node_children(zval **children
-
- /* Get the namespace of the current node and add it as a property */
- /* XXX FIXME XXX */
--/*
-+/*
- if(!node_namespace(&namespace, last))
- zend_hash_update(Z_OBJPROP_P(child), "namespace", sizeof("namespace"), (void *) &namespace, sizeof(zval *), NULL);
- */
-@@ -2619,7 +3063,7 @@ PHP_FUNCTION(xmltree)
- xmlNode *root;
- int ret, buf_len;
- char *buf;
--
-+
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &buf, &buf_len) == FAILURE) {
- return;
- }
-@@ -2690,7 +3134,7 @@ static void php_xpathptr_new_context(INT
- }
- /* }}} */
-
--/* {{{ proto string xpath_new_context([int doc_handle])
-+/* {{{ proto object xpath_new_context([int doc_handle])
- Creates new XPath context */
- PHP_FUNCTION(xpath_new_context)
- {
-@@ -2698,7 +3142,7 @@ PHP_FUNCTION(xpath_new_context)
- }
- /* }}} */
-
--/* {{{ proto string xptr_new_context([int doc_handle])
-+/* {{{ proto object xptr_new_context([int doc_handle])
- Creates new XPath context */
- PHP_FUNCTION(xptr_new_context)
- {
-@@ -2731,10 +3175,10 @@ static void php_xpathptr_eval(INTERNAL_F
- }
-
- ctxp = php_xpath_get_context(id, le_xpathctxp, 0 TSRMLS_CC);
-- if (!ctxp) {
-- php_error(E_WARNING, "%s() cannot fetch XPATH context", get_active_function_name(TSRMLS_C));
-- RETURN_FALSE;
-- }
-+ if (!ctxp) {
-+ php_error(E_WARNING, "%s(): cannot fetch XPATH context", get_active_function_name(TSRMLS_C));
-+ RETURN_FALSE;
-+ }
-
- if (contextnode) {
- DOMXML_GET_OBJ(contextnodep, contextnode, le_domxmlnodep);
-@@ -2761,7 +3205,7 @@ static void php_xpathptr_eval(INTERNAL_F
- }
-
- if (NULL == (rv = php_xpathobject_new(xpathobjp, &ret TSRMLS_CC))) {
-- php_error(E_WARNING, "%s() cannot create required XPATH objcet", get_active_function_name(TSRMLS_C));
-+ php_error(E_WARNING, "%s(): cannot create required XPATH objcet", get_active_function_name(TSRMLS_C));
- RETURN_FALSE;
- }
- SEPARATE_ZVAL(&rv);
-@@ -2836,7 +3280,7 @@ static void php_xpathptr_eval(INTERNAL_F
- }
- /* }}} */
-
--/* {{{ proto int xpath_eval([int xpathctx_handle,] string str)
-+/* {{{ proto object xpath_eval([object xpathctx_handle,] string str)
- Evaluates the XPath Location Path in the given string */
- PHP_FUNCTION(xpath_eval)
- {
-@@ -2844,13 +3288,46 @@ PHP_FUNCTION(xpath_eval)
- }
- /* }}} */
-
--/* {{{ proto int xpath_eval_expression([int xpathctx_handle,] string str)
-- Evaluates the XPath Location Path in the given string */
-+/* {{{ proto object xpath_eval_expression([object xpathctx_handle,] string str)
-+ Evaluates the XPath expression in the given string */
- PHP_FUNCTION(xpath_eval_expression)
- {
- php_xpathptr_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_XPATH, 1);
- }
- /* }}} */
-+
-+/* {{{ proto bool xpath_register_ns([object xpathctx_handle,] string namespace_prefix, string namespace_uri)
-+ Registeres the given namespace in the passed XPath context */
-+PHP_FUNCTION(xpath_register_ns)
-+{
-+ /*
-+ TODO:
-+ - automagically register all namespaces when creating a new context
-+ */
-+
-+ int prefix_len, uri_len, result;
-+ xmlXPathContextPtr ctxp;
-+ char *prefix, *uri, *uri_static;
-+ zval *id;
-+
-+ DOMXML_PARAM_FOUR(ctxp, id, le_xpathctxp, "ss", &prefix, &prefix_len, &uri, &uri_len);
-+
-+ /* set the context node to NULL - what is a context node anyway? */
-+ ctxp->node = NULL;
-+
-+ /*
-+ this is a hack - libxml2 doesn't copy the URI, it simply uses the string
-+ given in the parameter - which is normally deallocated after the function
-+ */
-+ uri_static = estrndup(uri, uri_len);
-+ result = xmlXPathRegisterNs(ctxp, prefix, uri_static);
-+
-+ if (0 == result) {
-+ RETURN_TRUE;
-+ }
-+ RETURN_FALSE;
-+}
-+/* }}} */
- #endif /* defined(LIBXML_XPATH_ENABLED) */
-
- #if defined(LIBXML_XPTR_ENABLED)
-@@ -2864,12 +3341,266 @@ PHP_FUNCTION(xptr_eval)
- #endif /* LIBXML_XPTR_ENABLED */
-
- /* {{{ proto string domxml_version(void)
-- Dumps document into string */
-+ Get XML library version */
- PHP_FUNCTION(domxml_version)
- {
- RETURN_STRING(LIBXML_DOTTED_VERSION, 1);
- }
- /* }}} */
-+
-+#if HAVE_DOMXSLT
-+static zval *php_xsltstylesheet_new(xsltStylesheetPtr obj, int *found TSRMLS_DC)
-+{
-+ zval *wrapper;
-+ int rsrc_type;
-+
-+ if (! found) {
-+ *found = 0;
-+ }
-+
-+ if (!obj) {
-+ MAKE_STD_ZVAL(wrapper);
-+ ZVAL_NULL(wrapper);
-+ return wrapper;
-+ }
-+
-+ if ((wrapper = (zval *) dom_object_get_data((void *) obj))) {
-+ zval_add_ref(&wrapper);
-+ *found = 1;
-+ return wrapper;
-+ }
-+
-+ MAKE_STD_ZVAL(wrapper);
-+
-+ object_init_ex(wrapper, domxsltstylesheet_class_entry);
-+ rsrc_type = le_domxsltstylesheetp;
-+ php_xsltstylesheet_set_object(wrapper, (void *) obj, rsrc_type);
-+
-+ return (wrapper);
-+}
-+
-+/* {{{ proto object domxml_xslt_stylesheet(string xsltstylesheet)
-+ Creates XSLT Stylesheet object from string */
-+PHP_FUNCTION(domxml_xslt_stylesheet)
-+{
-+ zval *rv;
-+ xmlDocPtr docp;
-+ xsltStylesheetPtr sheetp;
-+ int ret;
-+ char *buffer;
-+ int buffer_len;
-+
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &buffer, &buffer_len) == FAILURE) {
-+ RETURN_FALSE;
-+ }
-+
-+ docp = xmlParseDoc(buffer);
-+
-+ if (!docp)
-+ RETURN_FALSE;
-+
-+ sheetp = xsltParseStylesheetDoc(docp);
-+
-+ if (!sheetp)
-+ RETURN_FALSE;
-+
-+ rv = php_xsltstylesheet_new(sheetp, &ret TSRMLS_CC);
-+ DOMXML_RET_ZVAL(rv);
-+}
-+/* }}} */
-+
-+/* {{{ proto object domxml_xslt_stylesheet_doc(object xmldoc)
-+ Creates XSLT Stylesheet object from DOM Document object */
-+PHP_FUNCTION(domxml_xslt_stylesheet_doc)
-+{
-+ zval *rv, *idxml;
-+ xmlDocPtr docp;
-+ xmlDocPtr newdocp;
-+ xsltStylesheetPtr sheetp;
-+ int ret;
-+
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &idxml) == FAILURE) {
-+ RETURN_FALSE;
-+ }
-+
-+ DOMXML_GET_OBJ(docp, idxml, le_domxmldocp);
-+
-+ newdocp = xmlCopyDoc(docp, 1);
-+
-+ if (!newdocp)
-+ RETURN_FALSE;
-+
-+ sheetp = xsltParseStylesheetDoc(newdocp);
-+
-+ if (!sheetp)
-+ RETURN_FALSE;
-+
-+ rv = php_xsltstylesheet_new(sheetp, &ret TSRMLS_CC);
-+ DOMXML_RET_ZVAL(rv);
-+}
-+/* }}} */
-+
-+/* {{{ proto object domxml_xslt_stylesheet_file(string filename)
-+ Creates XSLT Stylesheet object from file */
-+PHP_FUNCTION(domxml_xslt_stylesheet_file)
-+{
-+ zval *rv;
-+ xsltStylesheetPtr sheetp;
-+ int ret, file_len;
-+ char *file;
-+
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &file, &file_len) == FAILURE) {
-+ RETURN_FALSE;
-+ }
-+
-+ sheetp = xsltParseStylesheetFile(file);
-+
-+ if (!sheetp)
-+ RETURN_FALSE;
-+
-+ rv = php_xsltstylesheet_new(sheetp, &ret TSRMLS_CC);
-+ DOMXML_RET_ZVAL(rv);
-+}
-+/* }}} */
-+
-+/* {{{ php_domxslt_string_to_xpathexpr()
-+ Translates a string to a XPath Expression */
-+static char *php_domxslt_string_to_xpathexpr(const char *str)
-+{
-+ const xmlChar *string = (const xmlChar *)str;
-+
-+ xmlChar *value;
-+
-+ TSRMLS_FETCH();
-+
-+ if (xmlStrchr(string, '"')) {
-+ if (xmlStrchr(string, '\'')) {
-+ php_error(E_WARNING, "Cannot create XPath expression (string contains both quote and double-quotes) in %s",
-+ get_active_function_name(TSRMLS_C));
-+ return NULL;
-+ }
-+ value = xmlStrdup((const xmlChar *)"'");
-+ value = xmlStrcat(value, string);
-+ value = xmlStrcat(value, (const xmlChar *)"'");
-+ }
-+ else {
-+ value = xmlStrdup((const xmlChar *)"\"");
-+ value = xmlStrcat(value, string);
-+ value = xmlStrcat(value, (const xmlChar *)"\"");
-+ }
-+
-+ return (char *)value;
-+}
-+
-+/* {{{ php_domxslt_make_params()
-+ Translates a PHP array to a libxslt parameters array */
-+static char **php_domxslt_make_params(zval *idvars, int xpath_params)
-+{
-+ HashTable *parht;
-+ int parsize;
-+ zval **value;
-+ char *xpath_expr, *string_key = NULL;
-+ ulong num_key;
-+ char **params = NULL;
-+ int i = 0;
-+
-+ TSRMLS_FETCH();
-+
-+ parht = HASH_OF(idvars);
-+ parsize = (2 * zend_hash_num_elements(parht) + 1) * sizeof(char *);
-+ params = (char **)emalloc(parsize);
-+ memset((char *)params, 0, parsize);
-+
-+ for (zend_hash_internal_pointer_reset(parht);
-+ zend_hash_get_current_data(parht, (void **)&value) == SUCCESS;
-+ zend_hash_move_forward(parht)) {
-+
-+ if (zend_hash_get_current_key(parht, &string_key, &num_key, 1) != HASH_KEY_IS_STRING) {
-+ php_error(E_WARNING, "Invalid argument or parameter array to %s",
-+ get_active_function_name(TSRMLS_C));
-+ return NULL;
-+ }
-+ else {
-+ SEPARATE_ZVAL(value);
-+ convert_to_string_ex(value);
-+
-+ if (!xpath_params) {
-+ xpath_expr = php_domxslt_string_to_xpathexpr(Z_STRVAL_PP(value));
-+ }
-+ else {
-+ xpath_expr = Z_STRVAL_PP(value);
-+ }
-+
-+ if (xpath_expr) {
-+ params[i++] = string_key;
-+ params[i++] = xpath_expr;
-+ }
-+ }
-+ }
-+
-+ params[i++] = NULL;
-+
-+ return params;
-+}
-+
-+/* {{{ proto object domxml_xslt_process(object xslstylesheet, object xmldoc [, array xslt_parameters [, bool xpath_parameters]])
-+ Perform an XSLT transformation */
-+PHP_FUNCTION(domxml_xslt_process)
-+{
-+/* TODO:
-+ - test memory deallocation
-+ - test other stuff
-+ - check xsltsp->errors ???
-+*/
-+ zval *rv, *idxsl, *idxml, *idparams = NULL;
-+ zend_bool xpath_params = 0;
-+ xsltStylesheetPtr xsltstp;
-+ xmlDocPtr xmldocp;
-+ xmlDocPtr docp;
-+ char **params = NULL;
-+ int ret;
-+
-+ DOMXML_GET_THIS(idxsl);
-+
-+ xsltstp = php_xsltstylesheet_get_object(idxsl, le_domxsltstylesheetp, 0 TSRMLS_CC);
-+ if (!xsltstp) {
-+ php_error(E_WARNING, "%s(): underlying object missing",
-+ get_active_function_name(TSRMLS_C));
-+ RETURN_FALSE;
-+ }
-+
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o|ab", &idxml, &idparams, &xpath_params) == FAILURE) {
-+ RETURN_FALSE;
-+ }
-+
-+ DOMXML_GET_OBJ(xmldocp, idxml, le_domxmldocp);
-+
-+ if (idparams) {
-+ params = php_domxslt_make_params(idparams, xpath_params);
-+ }
-+
-+ docp = xsltApplyStylesheet(xsltstp, xmldocp, (const char**)params);
-+
-+ if (params) {
-+ efree(params);
-+ }
-+
-+ if (!docp) {
-+ RETURN_FALSE;
-+ }
-+
-+ DOMXML_RET_OBJ(rv, (xmlNodePtr) docp, &ret);
-+}
-+/* }}} */
-+
-+/* {{{ proto string domxml_xslt_version(void)
-+ Get XSLT library version */
-+PHP_FUNCTION(domxml_xslt_version)
-+{
-+ RETURN_STRING(LIBXSLT_DOTTED_VERSION, 1);
-+}
-+/* }}} */
-+#endif /* HAVE_DOMXSLT */
-
- #endif /* HAVE_DOMXML */
-
-diff -upr php-4.1.2/ext/domxml/php_domxml.h php-4.1.2-dom-xslt/ext/domxml/php_domxml.h
---- php-4.1.2/ext/domxml/php_domxml.h Fri Dec 14 11:45:46 2001
-+++ php-4.1.2-dom-xslt/ext/domxml/php_domxml.h Tue Jan 22 00:21:32 2002
-@@ -16,19 +16,36 @@
- +----------------------------------------------------------------------+
- */
-
--/* $Id$ */
-+/* $Id$ */
-
- #ifndef PHP_DOMXML_H
- #define PHP_DOMXML_H
-
- #if HAVE_DOMXML
- #include <libxml/parser.h>
-+#include <libxml/tree.h>
-+#include <libxml/xmlerror.h>
-+#if defined(LIBXML_HTML_ENABLED)
-+#include <libxml/HTMLparser.h>
-+#include <libxml/HTMLtree.h>
-+#endif
- #if defined(LIBXML_XPATH_ENABLED)
- #include <libxml/xpath.h>
-+#include <libxml/xpathInternals.h>
- #endif
- #if defined(LIBXML_XPTR_ENABLED)
- #include <libxml/xpointer.h>
- #endif
-+#if HAVE_DOMXSLT
-+#include <libxslt/xsltconfig.h>
-+#include <libxslt/xsltInternals.h>
-+#include <libxslt/xsltutils.h>
-+#include <libxslt/transform.h>
-+#if HAVE_DOMEXSLT
-+#include <libexslt/exslt.h>
-+#include <libexslt/exsltconfig.h>
-+#endif
-+#endif
-
- extern zend_module_entry domxml_module_entry;
- #define domxml_module_ptr &domxml_module_entry
-@@ -40,8 +57,13 @@ PHP_MINFO_FUNCTION(domxml);
- PHP_FUNCTION(domxml_version);
- PHP_FUNCTION(xmldoc);
- PHP_FUNCTION(xmldocfile);
-+#if defined(LIBXML_HTML_ENABLED)
-+PHP_FUNCTION(html_doc);
-+PHP_FUNCTION(html_doc_file);
-+#endif
- PHP_FUNCTION(xmltree);
- PHP_FUNCTION(domxml_new_xmldoc);
-+PHP_FUNCTION(domxml_substitute_entities_default);
-
- /* Class Document methods */
- PHP_FUNCTION(domxml_doc_doctype);
-@@ -57,7 +79,13 @@ PHP_FUNCTION(domxml_doc_create_entity_re
- PHP_FUNCTION(domxml_doc_imported_node);
- PHP_FUNCTION(domxml_add_root);
- PHP_FUNCTION(domxml_intdtd);
--PHP_FUNCTION(domxml_dumpmem);
-+PHP_FUNCTION(domxml_dump_mem);
-+PHP_FUNCTION(domxml_dump_mem_file);
-+PHP_FUNCTION(domxml_dump_node);
-+
-+#if defined(LIBXML_HTML_ENABLED)
-+PHP_FUNCTION(domxml_html_dump_mem);
-+#endif
-
- /* Class DocumentType methods */
- PHP_FUNCTION(domxml_doctype_name);
-@@ -89,8 +117,10 @@ PHP_FUNCTION(domxml_node_prefix);
- PHP_FUNCTION(domxml_node);
- PHP_FUNCTION(domxml_clone_node);
- PHP_FUNCTION(domxml_node_unlink_node);
-+PHP_FUNCTION(domxml_node_replace_node);
- PHP_FUNCTION(domxml_node_new_child);
- PHP_FUNCTION(domxml_node_set_content);
-+PHP_FUNCTION(domxml_node_get_content);
- PHP_FUNCTION(domxml_node_text_concat);
- PHP_FUNCTION(domxml_node_set_name);
- PHP_FUNCTION(domxml_node_name);
-@@ -135,12 +165,22 @@ PHP_FUNCTION(xpath_init);
- PHP_FUNCTION(xpath_new_context);
- PHP_FUNCTION(xpath_eval);
- PHP_FUNCTION(xpath_eval_expression);
-+PHP_FUNCTION(xpath_register_ns);
- #endif
- #if defined(LIBXML_XPTR_ENABLED)
- PHP_FUNCTION(xptr_new_context);
- PHP_FUNCTION(xptr_eval);
- #endif
- PHP_FUNCTION(domxml_test);
-+
-+/* DOMXSLT functions */
-+#if HAVE_DOMXSLT
-+PHP_FUNCTION(domxml_xslt_stylesheet);
-+PHP_FUNCTION(domxml_xslt_stylesheet_doc);
-+PHP_FUNCTION(domxml_xslt_stylesheet_file);
-+PHP_FUNCTION(domxml_xslt_process);
-+PHP_FUNCTION(domxml_xslt_version);
-+#endif
-
- #else
- #define domxml_module_ptr NULL
+++ /dev/null
-diff -u -r1.87 zend_API.h
---- php-4.0.6.orig/Zend/zend_API.h 2001/04/19 17:51:23
-+++ php-4.0.6/Zend/zend_API.h 2001/08/24 13:18:51
-@@ -268,8 +268,8 @@
- (z)->type = IS_STRING; \
- }
-
--#define ZVAL_FALSE { (z)->value.lval = 0; (z)->type = IS_BOOL; }
--#define ZVAL_TRUE { (z)->value.lval = 1; (z)->type = IS_BOOL; }
-+#define ZVAL_FALSE(z) { (z)->value.lval = 0; (z)->type = IS_BOOL; }
-+#define ZVAL_TRUE(z) { (z)->value.lval = 1; (z)->type = IS_BOOL; }
-
- #define RETVAL_RESOURCE(l) { \
- return_value->type = IS_RESOURCE;\
+++ /dev/null
---- php-4.0.6/ext/pdf/config.m4.wiget Thu Jun 14 06:35:44 2001
-+++ php-4.0.6/ext/pdf/config.m4 Fri Jul 6 08:37:53 2001
-@@ -18,7 +18,7 @@
- AC_CHECK_LIB(pdf, PDF_show_boxed, [
- AC_DEFINE(HAVE_PDFLIB,1,[ ])
- ],[
-- AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x. You may also need libtiff and libjpeg. If so, use the options --with-tiff-dir=<DIR> and --with-jpeg-dir=<DIR>)
-+ AC_MSG_ERROR([pdflib extension requires at least pdflib 3.x. You may also need libtiff and libjpeg. If so, use the options --with-tiff-dir=<DIR> and --with-jpeg-dir=<DIR>])
- ],[
- -ltiff -ljpeg -lpng -lz
- ])
-@@ -34,7 +34,7 @@
- if test -n "$PDFLIB_INCLUDE" ; then
-
- if test "$PHP_ZLIB_DIR" = "no"; then
-- AC_MSG_ERROR(PDF extension requires ZLIB. Use --with-zlib-dir=<DIR>)
-+ AC_MSG_ERROR([PDF extension requires ZLIB. Use --with-zlib-dir=<DIR>])
- fi
-
- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDFLIB_SHARED_LIBADD)
-@@ -47,7 +47,7 @@
- [
- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDFLIB_SHARED_LIBADD)
- ],[
-- AC_MSG_ERROR(libjpeg not found!)
-+ AC_MSG_ERROR([libjpeg not found!])
- ],[
- -L$PHP_JPEG_DIR/lib
- ])
-@@ -56,12 +56,12 @@
- [
- PHP_ADD_LIBRARY(jpeg,, PDFLIB_SHARED_LIBADD)
- ],[
-- AC_MSG_RESULT(no, try --with-jpeg-dir=<DIR>)
-+ AC_MSG_RESULT([no, try --with-jpeg-dir=<DIR>])
- ])
- fi
-
-
-- PHP_ARG_WITH(png-dir, for the location of libpng,
-+ PHP_ARG_WITH(png-dir,[ for the location of libpng],
- [ --with-png-dir[=DIR] PDFLIB: define libpng install directory])
-
- if test "$PHP_PNG_DIR" != "no"; then
-@@ -69,7 +69,7 @@
- [
- PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDFLIB_SHARED_LIBADD)
- ],[
-- AC_MSG_ERROR(libpng not found!)
-+ AC_MSG_ERROR([libpng not found!])
- ],[
- -L$PHP_PNG_DIR/lib
- ])
-@@ -78,12 +78,12 @@
- [
- PHP_ADD_LIBRARY(png,, PDFLIB_SHARED_LIBADD)
- ],[
-- AC_MSG_RESULT(no, try --with-png-dir=<DIR>)
-+ AC_MSG_RESULT([no, try --with-png-dir=<DIR>])
- ])
- fi
-
-
-- PHP_ARG_WITH(tiff-dir, for the location of libtiff,
-+ PHP_ARG_WITH(tiff-dir,[ for the location of libtiff],
- [ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory])
-
- if test "$PHP_TIFF_DIR" != "no"; then
-@@ -91,7 +91,7 @@
- [
- PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDFLIB_SHARED_LIBADD)
- ],[
-- AC_MSG_ERROR(libtiff not found!)
-+ AC_MSG_ERROR([libtiff not found!])
- ],[
- -L$PHP_TIFF_DIR/lib
- ])
-@@ -100,7 +100,7 @@
- [
- PHP_ADD_LIBRARY(tiff,, PDFLIB_SHARED_LIBADD)
- ],[
-- AC_MSG_RESULT(no, Try --with-tiff-dir=<DIR>)
-+ AC_MSG_RESULT([no, Try --with-tiff-dir=<DIR>])
- ])
- fi
-
-@@ -111,7 +111,7 @@
- PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDFLIB_SHARED_LIBADD)
- PHP_ADD_INCLUDE($PDFLIB_INCLUDE)
- ],[
-- AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x.)
-+ AC_MSG_ERROR([pdflib extension requires at least pdflib 3.x.])
- ],[
- -L$PHP_PDFLIB/lib
- ])
---- php-4.0.6/ext/yp/config.m4.wiget Fri Jul 6 08:37:53 2001
-+++ php-4.0.6/ext/yp/config.m4 Fri Jul 6 08:37:53 2001
-@@ -2,13 +2,15 @@
- dnl config.m4 for extension yp
- dnl don't forget to call PHP_EXTENSION(yp)
-
--PHP_ARG_ENABLE(yp,whether to include YP support,
-+PHP_ARG_ENABLE(yp,[whether to include YP support],
- [ --enable-yp Include YP support])
-
- if test "$PHP_YP" != "no"; then
- PHP_SUBST(NSL_SHARED_LIBADD)
-- AC_ADD_LIBRARY_WITH_PATH(nsl, /usr/lib, NSL_SHARED_LIBADD)
-- AC_CHECK_LIB(nsl, yp_match, [AC_DEFINE(HAVE_YP,1,[ ])], [AC_MSG_ERROR(YP module requires libnsl)],)
-+ AC_CHECK_LIB(nsl, yp_match, [
-+ AC_DEFINE(HAVE_YP,1,[ ])
-+ PHP_ADD_LIBRARY(nsl,, NSL_SHARED_LIBADD)
-+ ], [AC_MSG_ERROR([YP module requires libnsl])])
- PHP_EXTENSION(yp, $ext_shared)
-
- case "$host_alias" in
---- php-4.1.1/acinclude.m4.wiget Sun Jun 10 21:52:56 2001
-+++ php-4.1.1/acinclude.m4 Fri Jul 6 09:26:10 2001
-@@ -351,7 +351,7 @@
- AC_SUBST($1)
- ])
-
--AC_DEFUN(PHP_FAST_OUTPUT,[
-+AC_DEFUN([PHP_FAST_OUTPUT],[
- PHP_FAST_OUTPUT_FILES="$PHP_FAST_OUTPUT_FILES $1"
- ])
-
-@@ -377,7 +377,7 @@
- done
- ])
-
--AC_DEFUN(PHP_GEN_MAKEFILES,[
-+AC_DEFUN([PHP_GEN_MAKEFILES],[
- $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $1
- ])
-
-@@ -914,6 +908,7 @@
- dnl ## This macro can be used several times.
- AC_DEFUN(PHP_OUTPUT,[
- PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES $1"
-+ AC_CONFIG_FILES($1)
- ])
-
- AC_DEFUN(PHP_DECLARED_TIMEZONE,[
---- php-4.0.6/configure.in.wiget Fri Jul 6 08:37:53 2001
-+++ php-4.0.6/configure.in Fri Jul 6 09:32:15 2001
-@@ -5,7 +5,7 @@
-
- AC_INIT(README.CVS-RULES)
-
--PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile main/Makefile)
-+PHP_FAST_OUTPUT([sapi/Makefile ext/Makefile Makefile pear/Makefile main/Makefile])
-
- if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then
- AC_MSG_ERROR(--with-shared-apache is not supported. Please refer to the documentation for using APXS)
-@@ -117,10 +117,7 @@
- AC_PROG_CC_C_O
- AC_PROG_LN_S
-
--AM_PROG_LEX
--if test -n "$LEX"; then
-- AC_DECL_YYTEXT
--fi
-+AC_PROG_LEX()
-
- dnl ## Make flex scanners use const if they can, even if __STDC__ is not
- dnl ## true, for compilers like Sun's that only set __STDC__ true in
-@@ -225,12 +222,12 @@
-
- unset ac_cv_func_yp_get_default_domain
- AC_CHECK_FUNC(yp_get_default_domain,
-- [php_no_nsl_checks=yes],[ ])
-+ [php_no_nsl_checks=yes],[true ])
- unset ac_cv_func_yp_get_default_domain
-
- if test "$php_no_nsl_checks" != "yes"; then
-
--AC_CHECK_FUNC(gethostname, [ ], [
-+AC_CHECK_FUNC(gethostname, [true ], [
- AC_CHECK_LIB(nsl, gethostname, [
- PHP_ADD_LIBRARY(nsl)
- AC_DEFINE(HAVE_LIBNSL,1,[ ]) ],[
-@@ -250,8 +247,8 @@
-
- dnl Only include libbind if inet_aton is not found in
- dnl libresolv.
--AC_CHECK_LIB(resolv, inet_aton, [], [
-- AC_CHECK_LIB(bind, inet_aton, [], [
-+AC_CHECK_LIB(resolv, inet_aton, [true], [
-+ AC_CHECK_LIB(bind, inet_aton, [true], [
- AC_CHECK_LIB(bind, __inet_aton)
- ])
- ])
-@@ -870,6 +867,12 @@
- PHP_SUBST(TSRM_LIB)
- PHP_SUBST(WARNING_LEVEL)
- PHP_SUBST_OLD(YACC)
-+PHP_SUBST(EXT_SUBDIRS)
-+PHP_SUBST(EXT_STATIC)
-+PHP_SUBST(EXT_SHARED)
-+PHP_SUBST(EXT_LIBS)
-+PHP_SUBST(EXT_LTLIBS)
-+
-
- PHP_CONFIGURE_PART(Configuring libtool)
-
-@@ -936,14 +939,17 @@
- pear/scripts/pear pear/scripts/phpize pear/scripts/php-config \
- TSRM/Makefile $PHP_OUTPUT_FILES"
-
--AC_OUTPUT($ALL_OUTPUT_FILES, [], [
-+AC_CONFIG_FILES([php4.spec Zend/Makefile main/build-defs.h
-+ pear/scripts/pear pear/scripts/phpize pear/scripts/php-config
-+ TSRM/Makefile])
-+AC_CONFIG_COMMANDS([default], [true], [
-
--if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES"; then
-+dnl if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES"; then
- REDO_ALL=yes
--fi
-+dnl fi
-
- if test -n "\$REDO_ALL"; then
-- PHP_GEN_MAKEFILES($PHP_FAST_OUTPUT_FILES)
-+ PHP_GEN_MAKEFILES([$PHP_FAST_OUTPUT_FILES])
- fi
-
- if test ! -f $srcdir/ext/bcmath/number.c; then
-@@ -1057,6 +1063,8 @@
- fi
- ])
-
-+AC_OUTPUT
-+
- dnl ## Local Variables:
- dnl ## tab-width: 4
- dnl ## End:
---- php-4.1.1/ext/imap/config.m4.orig Tue Aug 7 18:18:04 2001
-+++ php-4.1.1/ext/imap/config.m4 Sat Jan 19 13:50:24 2002
-@@ -133,7 +133,7 @@
- #endif
- ],[
- AC_DEFINE(HAVE_IMAP2001, 1, [ ])
-- ],[ ])
-+ ],[:])
- CPPFLAGS=$old_CPPFLAGS
-
- AC_CHECK_LIB(pam, pam_start)
+++ /dev/null
-diff -urN php-4.1.2.org/TSRM/threads.m4 php-4.1.2/TSRM/threads.m4
---- php-4.1.2.org/TSRM/threads.m4 Mon Apr 8 01:42:39 2002
-+++ php-4.1.2/TSRM/threads.m4 Mon Apr 8 01:43:36 2002
-@@ -32,7 +32,11 @@
- dnl
- AC_DEFUN(PTHREADS_FLAGS,[
- if test -z "$host_alias"; then
-- AC_MSG_ERROR(host_alias is not set. Make sure to run config.guess)
-+ if test -z "$build_alias"; then
-+ AC_MSG_ERROR(host_alias is not set. Make sure to run config.guess)
-+ else
-+ host_alias=$build_alias
-+ fi
- fi
- case "$host_alias" in
- *solaris*)
-diff -urN php-4.1.2.org/configure.in php-4.1.2/configure.in
---- php-4.1.2.org/configure.in Mon Apr 8 01:42:39 2002
-+++ php-4.1.2/configure.in Mon Apr 8 01:42:57 2002
-@@ -115,11 +115,11 @@
-
- AM_PROG_CC_STDC
-
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- AC_PROG_CC_C_O
- AC_PROG_LN_S
-
--AC_PROG_LEX
-+AM_PROG_LEX
- if test -n "$LEX"; then
- AC_DECL_YYTEXT
- fi
+++ /dev/null
-diff -urN php-4.1.2.org/sapi/apache2filter/apache_config.c php-4.1.2/sapi/apache2filter/apache_config.c
---- php-4.1.2.org/sapi/apache2filter/apache_config.c Mon Apr 8 02:40:24 2002
-+++ php-4.1.2/sapi/apache2filter/apache_config.c Wed Feb 28 15:11:34 2001
-@@ -88,7 +88,7 @@
- php_dir_entry *pe;
- php_dir_entry *data;
- char *str;
-- uint str_len;
-+ ulong str_len;
- ulong num_index;
-
- phpapdebug((stderr, "Merge dir (%p) (%p)\n", base_conf, new_conf));
-@@ -110,7 +110,7 @@
- {
- php_conf_rec *d = dummy;
- char *str;
-- uint str_len;
-+ ulong str_len;
- php_dir_entry *data;
-
- for (zend_hash_internal_pointer_reset(&d->config);
-diff -urN php-4.1.2.org/sapi/apache2filter/php_apache.h php-4.1.2/sapi/apache2filter/php_apache.h
---- php-4.1.2.org/sapi/apache2filter/php_apache.h Mon Apr 8 02:40:24 2002
-+++ php-4.1.2/sapi/apache2filter/php_apache.h Mon Apr 8 02:34:03 2002
-@@ -1,8 +1,8 @@
- /*
- +----------------------------------------------------------------------+
-- | PHP version 4.0 |
-+ | PHP Version 4 |
- +----------------------------------------------------------------------+
-- | Copyright (c) 1997-2001 The PHP Group |
-+ | Copyright (c) 1997-2002 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 2.02 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
-@@ -12,7 +12,7 @@
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
-- | Authors: Sascha Schumann <sascha@schumann.cx> |
-+ | Author: Sascha Schumann <sascha@schumann.cx> |
- +----------------------------------------------------------------------+
- */
-
-diff -urN php-4.1.2.org/sapi/apache2filter/php_functions.c php-4.1.2/sapi/apache2filter/php_functions.c
---- php-4.1.2.org/sapi/apache2filter/php_functions.c Mon Apr 8 02:40:24 2002
-+++ php-4.1.2/sapi/apache2filter/php_functions.c Mon Apr 8 02:39:31 2002
-@@ -38,6 +38,7 @@
- {
- zval **p1;
- php_struct *ctx;
-+ SLS_FETCH();
-
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &p1) == FAILURE)
- return NULL;
-@@ -109,6 +110,7 @@
- php_struct *ctx;
- apr_array_header_t *arr;
- char *key, *val;
-+ SLS_FETCH();
-
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
-@@ -135,7 +137,7 @@
- };
-
- static zend_module_entry php_apache_module = {
-- STANDARD_MODULE_HEADER,
-+ STANDARD_MODULE_HEADER,
- "Apache 2.0",
- apache_functions,
- NULL,
-diff -urN php-4.1.2.org/sapi/apache2filter/sapi_apache2.c php-4.1.2/sapi/apache2filter/sapi_apache2.c
---- php-4.1.2.org/sapi/apache2filter/sapi_apache2.c Mon Apr 8 02:40:24 2002
-+++ php-4.1.2/sapi/apache2filter/sapi_apache2.c Mon Apr 8 02:30:57 2002
-@@ -1,8 +1,8 @@
- /*
- +----------------------------------------------------------------------+
-- | PHP version 4.0 |
-+ | PHP Version 4 |
- +----------------------------------------------------------------------+
-- | Copyright (c) 1997-2001 The PHP Group |
-+ | Copyright (c) 1997-2002 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 2.02 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
-@@ -48,6 +48,7 @@
- {
- apr_bucket *b;
- apr_bucket_brigade *bb;
-+ apr_bucket_alloc_t *ba;
- php_struct *ctx;
- uint now;
-
-@@ -55,10 +56,11 @@
-
- if (str_length == 0) return 0;
-
-- bb = apr_brigade_create(ctx->f->r->pool);
-+ ba = ctx->f->r->connection->bucket_alloc;
-+ bb = apr_brigade_create(ctx->f->r->pool, ba);
- while (str_length > 0) {
- now = MIN(str_length, 4096);
-- b = apr_bucket_transient_create(str, now);
-+ b = apr_bucket_transient_create(str, now, ba);
- APR_BRIGADE_INSERT_TAIL(bb, b);
- str += now;
- str_length -= now;
-@@ -145,7 +147,7 @@
- php_apache_sapi_register_variables(zval *track_vars_array TSRMLS_DC)
- {
- php_struct *ctx = SG(server_context);
-- apr_array_header_t *arr = apr_table_elts(ctx->f->r->subprocess_env);
-+ const apr_array_header_t *arr = apr_table_elts(ctx->f->r->subprocess_env);
- char *key, *val;
-
- APR_ARRAY_FOREACH_OPEN(arr, key, val)
-@@ -161,15 +163,20 @@
- {
- php_struct *ctx = server_context;
- apr_bucket_brigade *bb;
-+ apr_bucket_alloc_t *ba;
- apr_bucket *b;
-
-+ if (!server_context)
-+ return;
-+
- /* Send a flush bucket down the filter chain. The current default
- * handler seems to act on the first flush bucket, but ignores
- * all further flush buckets.
- */
-
-- bb = apr_brigade_create(ctx->f->r->pool);
-- b = apr_bucket_flush_create();
-+ ba = ctx->f->r->connection->bucket_alloc;
-+ bb = apr_brigade_create(ctx->f->r->pool, ba);
-+ b = apr_bucket_flush_create(ba);
- APR_BRIGADE_INSERT_TAIL(bb, b);
- if (ap_pass_brigade(ctx->f->next, bb) != APR_SUCCESS) {
- php_handle_aborted_connection();
-@@ -182,8 +189,13 @@
- TSRMLS_FETCH();
-
- ctx = SG(server_context);
--
-- apr_file_puts(msg, ctx->f->r->server->error_log);
-+
-+ /* We use APLOG_STARTUP because it keeps us from printing the
-+ * data and time information at the beginning of the error log
-+ * line. Not sure if this is correct, but it mirrors what happens
-+ * with Apache 1.3 -- rbb
-+ */
-+ ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO | APLOG_STARTUP, 0, ctx->f->r->server, "%s", msg);
- }
-
- static sapi_module_struct apache2_sapi_module = {
-@@ -226,11 +238,11 @@
- if (ctx == NULL) { \
- /* Initialize filter context */ \
- SG(server_context) = ctx = apr_pcalloc(f->r->pool, sizeof(*ctx)); \
-- ctx->bb = apr_brigade_create(f->c->pool); \
-+ ctx->bb = apr_brigade_create(f->c->pool, f->c->bucket_alloc); \
- }
-
- static int php_input_filter(ap_filter_t *f, apr_bucket_brigade *bb,
-- ap_input_mode_t mode, apr_size_t *readbytes)
-+ ap_input_mode_t mode, apr_read_type_e block, apr_off_t readbytes)
- {
- php_struct *ctx;
- long old_index;
-@@ -240,11 +252,15 @@
- apr_status_t rv;
- TSRMLS_FETCH();
-
-+ if (f->r->proxyreq) {
-+ return ap_get_brigade(f->next, bb, mode, block, readbytes);
-+ }
-+
- ctx = SG(server_context);
-
- INIT_CTX;
-
-- if ((rv = ap_get_brigade(f->next, bb, mode, readbytes)) != APR_SUCCESS) {
-+ if ((rv = ap_get_brigade(f->next, bb, mode, block, readbytes)) != APR_SUCCESS) {
- return rv;
- }
-
-@@ -307,6 +323,14 @@
- void *conf = ap_get_module_config(f->r->per_dir_config, &php4_module);
- TSRMLS_FETCH();
-
-+ if (f->r->proxyreq) {
-+ return ap_pass_brigade(f->next, bb);
-+ }
-+
-+ /* setup standard CGI variables */
-+ ap_add_common_vars(f->r);
-+ ap_add_cgi_vars(f->r);
-+
- ctx = SG(server_context);
- INIT_CTX;
-
-@@ -361,9 +385,9 @@
- php_execute_script(&zfd TSRMLS_CC);
- } else {
-
--#define NO_DATA "The PHP Filter did not receive suitable input data"
-+#define PHP_NO_DATA "The PHP Filter did not receive suitable input data"
-
-- eos = apr_bucket_transient_create(NO_DATA, sizeof(NO_DATA)-1);
-+ eos = apr_bucket_transient_create(PHP_NO_DATA, sizeof(PHP_NO_DATA)-1, f->c->bucket_alloc);
- APR_BRIGADE_INSERT_HEAD(bb, eos);
- }
- }
-@@ -372,7 +396,7 @@
-
- SG(server_context) = 0;
- /* Pass EOS bucket to next filter to signal end of request */
-- eos = apr_bucket_eos_create();
-+ eos = apr_bucket_eos_create(f->c->bucket_alloc);
- APR_BRIGADE_INSERT_TAIL(bb, eos);
-
- return ap_pass_brigade(f->next, bb);
-@@ -391,21 +415,67 @@
- return APR_SUCCESS;
- }
-
--static void
--php_apache_server_startup(apr_pool_t *pchild, server_rec *s)
-+static void php_apache_add_version(apr_pool_t *p)
-+{
-+ TSRMLS_FETCH();
-+ if (PG(expose_php)) {
-+ ap_add_version_component(p, "PHP/" PHP_VERSION);
-+ }
-+}
-+
-+static int
-+php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog,
-+ apr_pool_t *ptemp, server_rec *s)
- {
- tsrm_startup(1, 1, 0, NULL);
- sapi_startup(&apache2_sapi_module);
- apache2_sapi_module.startup(&apache2_sapi_module);
-- apr_pool_cleanup_register(pchild, NULL, php_apache_server_shutdown, NULL);
-+ apr_pool_cleanup_register(pconf, NULL, php_apache_server_shutdown, apr_pool_cleanup_null);
- php_apache_register_module();
-+ php_apache_add_version(pconf);
-+
-+ return OK;
-+}
-+
-+static void php_add_filter(request_rec *r, ap_filter_t *f)
-+{
-+ int output = (f == r->output_filters);
-+
-+ /* for those who still have Set*Filter PHP configured */
-+ while (f) {
-+ if (strcmp(f->frec->name, "PHP") == 0) {
-+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
-+ 0, r->server,
-+ "\"Set%sFilter PHP\" already configured for %s",
-+ output ? "Output" : "Input", r->uri);
-+ return;
-+ }
-+ f = f->next;
-+ }
-+
-+ if (output) {
-+ ap_add_output_filter("PHP", NULL, r, r->connection);
-+ }
-+ else {
-+ ap_add_input_filter("PHP", NULL, r, r->connection);
-+ }
-+}
-+
-+static void php_insert_filter(request_rec *r)
-+{
-+ if (r->content_type &&
-+ strcmp(r->content_type, "application/x-httpd-php") == 0) {
-+ php_add_filter(r, r->output_filters);
-+ php_add_filter(r, r->input_filters);
-+ }
- }
-
- static void php_register_hook(apr_pool_t *p)
- {
-- ap_hook_child_init(php_apache_server_startup, NULL, NULL, APR_HOOK_MIDDLE);
-- ap_register_output_filter("PHP", php_output_filter, AP_FTYPE_CONTENT);
-- ap_register_input_filter("PHP", php_input_filter, AP_FTYPE_CONTENT);
-+ ap_hook_post_config(php_apache_server_startup, NULL, NULL, APR_HOOK_MIDDLE);
-+ ap_hook_insert_filter(php_insert_filter, NULL, NULL, APR_HOOK_MIDDLE);
-+ ap_register_output_filter("PHP", php_output_filter, AP_FTYPE_RESOURCE);
-+ ap_register_input_filter("PHP", php_input_filter, AP_FTYPE_RESOURCE);
- }
-
- AP_MODULE_DECLARE_DATA module php4_module = {
-@@ -417,3 +487,12 @@
- php_dir_cmds, /* command apr_table_t */
- php_register_hook /* register hooks */
- };
-+
-+/*
-+ * Local variables:
-+ * tab-width: 4
-+ * c-basic-offset: 4
-+ * End:
-+ * vim600: sw=4 ts=4 fdm=marker
-+ * vim<600: sw=4 ts=4
-+ */
+++ /dev/null
---- php-4.3.0/ext/cpdf/config.m4.orig Wed Mar 13 10:18:53 2002
-+++ php-4.3.0/ext/cpdf/config.m4 Thu Jan 2 13:12:16 2003
-@@ -1,70 +1,97 @@
- dnl $Id$
-
--AC_MSG_CHECKING(for cpdflib support)
--AC_ARG_WITH(cpdflib,
--[ --with-cpdflib[=DIR] Include cpdflib support (requires cpdflib >= 2).],
--[
-- case $withval in
-- no)
-- AC_MSG_RESULT(no) ;;
-+PHP_ARG_WITH(cpdflib, for cpdflib support,
-+[ --with-cpdflib[=DIR] Include cpdflib support (requires cpdflib >= 2).])
-+
-+if test "$PHP_CPDFLIB" != "no"; then
-+
-+ PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared)
-+ PHP_SUBST(CPDF_SHARED_LIBADD)
-+
-+ dnl # libjpeg
-+
-+ PHP_ARG_WITH(jpeg-dir, for the location of libjpeg,
-+ [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory. (OPTIONAL for PDFlib v4)])
-+
-+ if test "$PHP_JPEG_DIR" != "no"; then
-+ PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
-+ [
-+ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, CPDF_SHARED_LIBADD)
-+ ],[
-+ AC_MSG_ERROR([libjpeg not found!])
-+ ],[
-+ -L$PHP_JPEG_DIR/lib
-+ ])
-+ else
-+ AC_MSG_WARN([If configure fails, try --with-jpeg-dir=<DIR>])
-+ fi
-+
-+ dnl # libpng
-+
-+ PHP_ARG_WITH(png-dir, for the location of libpng,
-+ [ --with-png-dir[=DIR] PDFLIB: define libpng install directory. (OPTIONAL for PDFlib v4)])
-+
-+ if test "$PHP_PNG_DIR" != "no"; then
-+ PHP_CHECK_LIBRARY(png,png_create_info_struct,
-+ [
-+ PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, CPDF_SHARED_LIBADD)
-+ ],[
-+ AC_MSG_ERROR([libpng not found!])
-+ ],[
-+ -L$PHP_PNG_DIR/lib
-+ ])
-+ else
-+ AC_MSG_WARN([If configure fails, try --with-png-dir=<DIR>])
-+ fi
-+
-+ dnl # libtiff
-+
-+ PHP_ARG_WITH(tiff-dir, for the location of libtiff,
-+ [ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory. (OPTIONAL for PDFlib v4)])
-+
-+ if test "$PHP_TIFF_DIR" != "no"; then
-+ PHP_CHECK_LIBRARY(tiff,TIFFOpen,
-+ [
-+ PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, CPDF_SHARED_LIBADD)
-+ ],[
-+ AC_MSG_ERROR([libtiff not found!])
-+ ],[
-+ -L$PHP_TIFF_DIR/lib
-+ ])
-+ else
-+ AC_MSG_WARN([If configure fails, try --with-tiff-dir=<DIR>])
-+ fi
-+
-+ dnl # zlib
-+
-+ AC_MSG_CHECKING([for the location of zlib])
-+ if test "$PHP_ZLIB_DIR" = "no"; then
-+ AC_MSG_RESULT([no. If configure fails, try --with-zlib-dir=<DIR>])
-+ else
-+ AC_MSG_RESULT([$PHP_ZLIB_DIR])
-+ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, CPDF_SHARED_LIBADD)
-+ fi
-+
-+ case $PHP_CPDFLIB in
- yes)
-- AC_MSG_RESULT(yes)
-- PHP_NEW_EXTENSION(cpdf, cpdf.c)
- AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
- [AC_MSG_ERROR([Cpdf module requires cpdflib >= 2.])])
-+ PHP_ADD_LIBRARY(cpdf,, CPDF_SHARED_LIBADD)
-- PHP_ADD_LIBRARY(cpdf)
-- PHP_ADD_LIBRARY(tiff)
-- PHP_ADD_LIBRARY(jpeg)
- ;;
- *)
-- test -f $withval/include/cpdflib.h && CPDFLIB_INCLUDE=$withval/include
-- if test -n "$CPDFLIB_INCLUDE" ; then
-- AC_MSG_RESULT(yes)
-- PHP_NEW_EXTENSION(cpdf, cpdf.c)
-- old_LIBS=$LIBS
-- old_withval=$withval
--
-- AC_MSG_CHECKING([for libjpeg (needed by cpdflib 2.x)])
-- AC_ARG_WITH(jpeg-dir,
-- [ --with-jpeg-dir[=DIR] jpeg dir for cpdflib 2.x],[
-- AC_MSG_RESULT(yes)
-- if test -z $withval; then
-- withval=/usr/local
-- fi
-- LIBS="$LIBS -L$withval/lib"
-- AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_RESULT(no)],)
-- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib)
-- ],[
-- AC_MSG_RESULT(no)
-- AC_MSG_WARN(If configure fails try --with-jpeg-dir=<DIR>)
-- ])
--
-- AC_MSG_CHECKING([for libtiff (needed by cpdflib 2.x)])
-- AC_ARG_WITH(tiff-dir,
-- [ --with-tiff-dir[=DIR] tiff dir for cpdflib 2.x],[
-- AC_MSG_RESULT(yes)
-- if test -z $withval; then
-- withval=/usr/local
-- fi
-- LIBS="$LIBS -L$withval/lib"
-- AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_RESULT(no)],)
-- PHP_ADD_LIBRARY_WITH_PATH(tiff, $withval/lib)
-- ],[
-- AC_MSG_RESULT(no)
-- AC_MSG_WARN(If configure fails try --with-tiff-dir=<DIR>)
-- ])
-- withval=$old_withval
--
-- LIBS="$LIBS -L$withval/lib"
-- AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
-- [AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])])
-- LIBS=$old_LIBS
-- PHP_ADD_LIBRARY_WITH_PATH(cpdf, $withval/lib)
-- PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
-+ if test -f "$PHP_CPDFLIB/include/cpdflib.h"; then
-+ PHP_CHECK_LIBRARY(cpdf, cpdf_open,[
-+ AC_DEFINE(HAVE_PDFLIB,1,[ ])
-+ PHP_ADD_LIBRARY_WITH_PATH(cpdf, $PHP_CPDFLIB/lib, CPDF_SHARED_LIBADD)
-+ PHP_ADD_INCLUDE($PHP_CPDFLIB/include)
-+ ],[
-+ AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
-+ ],[
-+ -L$PHP_PDFLIB/lib
-+ ])
- else
-- AC_MSG_RESULT(no)
-- fi ;;
-+ AC_MSG_ERROR([cpdflib.h not found! Check the path passed to --with-cpdflib=<PATH>. PATH should be the install prefix directory.])
-+ fi
-+ ;;
- esac
--],[
-- AC_MSG_RESULT(no)
--])
-+fi
+++ /dev/null
---- php-4.1.1/ext/domxml/php_domxml.c~ Thu Feb 14 15:23:48 2002
-+++ php-4.1.1/ext/domxml/php_domxml.c Thu Feb 14 15:23:48 2002
-@@ -833,6 +833,7 @@
- if (Z_TYPE_P(obj) == XML_ENTITY_REF_NODE) {
- content = xmlNodeGetContent(nodep);
- if (content)
-+ add_property_long(wrapper, "type", Z_TYPE_P(nodep));
- add_property_stringl(wrapper, "content", (char *) content, strlen(content), 1);
- }
- break;
+++ /dev/null
---- php-4.1.1/ext/standard/image.c~ Thu Feb 14 15:40:36 2002
-+++ php-4.1.1/ext/standard/image.c Thu Feb 14 15:40:36 2002
-@@ -323,7 +323,9 @@
- unsigned int marker;
- char tmp[2];
- unsigned char a[4];
--
-+ unsigned short skip;
-+ unsigned char *buffer;
-+
- for (;;) {
- marker = php_next_marker(socketd, fp, issock);
- switch (marker) {
-@@ -349,7 +351,12 @@
- result->height = (((unsigned short) a[ 0 ]) << 8) + ((unsigned short) a[ 1 ]);
- result->width = (((unsigned short) a[ 2 ]) << 8) + ((unsigned short) a[ 3 ]);
- result->channels = FP_FGETC(socketd, fp, issock);
--
-+ /* skip component specification parameters */
-+ skip = result-> channels *3;
-+ buffer = emalloc(skip);
-+ FP_FREAD(buffer, (long) skip, socketd, fp, issock);
-+ efree(buffer);
-+
- if (! info) /* if we don't want an extanded info -> return */
- return result;
- } else {
+++ /dev/null
---- php-4.0.6/ext/imap/config.m4.imap Wed Jul 11 09:21:00 2001
-+++ php-4.0.6/ext/imap/config.m4 Wed Jul 11 09:28:24 2001
-@@ -49,14 +49,11 @@
-
- if test "$PHP_IMAP_SSL" != "no"; then
- PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
-- PHP_ADD_LIBRARY_DEFER(crypto)
-- PHP_ADD_LIBRARY_DEFER(ssl)
-+ PHP_ADD_LIBRARY(crypto, 1, IMAP_SHARED_LIBADD)
-+ PHP_ADD_LIBRARY(ssl, 1, IMAP_SHARED_LIBADD)
-
- old_LIBS=$LIBS
-- LIBS="$LIBS -lc-client"
-- if test $PHP_KERBEROS != "no"; then
-- LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-- fi
-+ LIBS="$LIBS $IMAP_SHARED_LIBADD"
- AC_TRY_RUN([
- void mm_log(void){}
- void mm_dlog(void){}
-@@ -133,8 +130,7 @@
- fi
-
- PHP_ADD_INCLUDE($IMAP_INC_DIR)
-- PHP_ADD_LIBPATH($IMAP_LIBDIR, IMAP_SHARED_LIBADD)
-- PHP_ADD_LIBRARY_DEFER($IMAP_LIB)
-+ PHP_ADD_LIBRARY_WITH_PATH($IMAP_LIB, $IMAP_LIBDIR, IMAP_SHARED_LIBADD)
- PHP_IMAP_KRB_CHK
- PHP_IMAP_SSL_CHK
- fi
+++ /dev/null
---- php-4.3.0/php.ini-dist Thu Dec 26 14:27:08 2002
-+++ php-4.3.0/php.ini Sat Jan 4 21:01:55 2003
-@@ -3,12 +3,18 @@
- ;;;;;;;;;;;
- ; WARNING ;
- ;;;;;;;;;;;
--; This is the default settings file for new PHP installations.
--; By default, PHP installs itself with a configuration suitable for
--; development purposes, and *NOT* for production purposes.
--; For several security-oriented considerations that should be taken
--; before going online with your site, please consult php.ini-recommended
--; and http://php.net/manual/en/security.php.
-+; This is the default settings file for new PHP installations from
-+; PLD Linux Distribution.
-+; It's based mainly on php.ini-dist, but with some changes made with
-+; security in mind (see below, consult also
-+; http://php.net/manual/en/security.php).
-+;
-+; Please note, that in PLD installations, /etc/php/php.ini file
-+; contains GLOBAL settings for all SAPIs (cgi, cli, apache...),
-+; and after reading this file, SAPI-specific file (/etc/php/php-cgi.ini,
-+; /etc/php/php-cli.ini, /etc/php/php-apache.ini...) is INCLUDED
-+; (so you don't need to duplicate whole large file to override only
-+; few options).
-
-
- ;;;;;;;;;;;;;;;;;;;
-@@ -54,12 +60,70 @@
- ; If you use constants in your value, and these constants belong to a
- ; dynamically loaded extension (either a PHP extension or a Zend extension),
- ; you may only use these constants *after* the line that loads the extension.
--;
--; All the values in the php.ini-dist file correspond to the builtin
--; defaults (that is, if no php.ini is used, or if you delete these lines,
--; the builtin defaults will be identical).
-
-
-+; Below is the list of settings changed from default as specified in
-+; php.ini-recommended. These settings make PHP more secure and encourage
-+; cleaner coding.
-+; The price is that with these settings, PHP may be incompatible with some old
-+; or bad-written applications, and sometimes, more difficult to develop with.
-+; Using this settings is warmly recommended for production sites. As all of
-+; the changes from the standard settings are thoroughly documented, you can
-+; go over each one, and decide whether you want to use it or not.
-+;
-+; - register_globals = Off [Security, Performance]
-+; Global variables are no longer registered for input data (POST, GET, cookies,
-+; environment and other server variables). Instead of using $foo, you must use
-+; you can use $_REQUEST["foo"] (includes any variable that arrives through the
-+; request, namely, POST, GET and cookie variables), or use one of the specific
-+; $_GET["foo"], $_POST["foo"], $_COOKIE["foo"] or $_FILES["foo"], depending
-+; on where the input originates. Also, you can look at the
-+; import_request_variables() function.
-+; Note that register_globals = Off is the default setting since PHP 4.2.0.
-+; - display_errors = Off [Security]
-+; With this directive set to off, errors that occur during the execution of
-+; scripts will no longer be displayed as a part of the script output, and thus,
-+; will no longer be exposed to remote users. With some errors, the error message
-+; content may expose information about your script, web server, or database
-+; server that may be exploitable for hacking. Production sites should have this
-+; directive set to off.
-+; - log_errors = On [Security]
-+; This directive complements the above one. Any errors that occur during the
-+; execution of your script will be logged (typically, to your server's error log,
-+; but can be configured in several ways). Along with setting display_errors to off,
-+; this setup gives you the ability to fully understand what may have gone wrong,
-+; without exposing any sensitive information to remote users.
-+; - error_reporting = E_ALL [Code Cleanliness, Security(?)]
-+; By default, PHP surpresses errors of type E_NOTICE. These error messages
-+; are emitted for non-critical errors, but that could be a symptom of a bigger
-+; problem. Most notably, this will cause error messages about the use
-+; of uninitialized variables to be displayed.
-+
-+; For completeness, below is list of the rest of changes recommended for
-+; performance, but NOT applied in default php.ini in PLD (since they are
-+; not needed for security or may cause problems with some applications
-+; more likely than above).
-+
-+; - output_buffering = 4096 [Performance]
-+; Set a 4KB output buffer. Enabling output buffering typically results in less
-+; writes, and sometimes less packets sent on the wire, which can often lead to
-+; better performance. The gain this directive actually yields greatly depends
-+; on which Web server you're working with, and what kind of scripts you're using.
-+; - register_argc_argv = Off [Performance]
-+; Disables registration of the somewhat redundant $argv and $argc global
-+; variables.
-+; - magic_quotes_gpc = Off [Performance]
-+; Input data is no longer escaped with slashes so that it can be sent into
-+; SQL databases without further manipulation. Instead, you should use the
-+; function addslashes() on each input element you wish to send to a database.
-+; - variables_order = "GPCS" [Performance]
-+; The environment variables are not hashed into the $HTTP_ENV_VARS[]. To access
-+; environment variables, you can use getenv() instead.
-+; - allow_call_time_pass_reference = Off [Code cleanliness]
-+; It's not possible to decide to force a variable to be passed by reference
-+; when calling a function. The PHP 4 style to do this is by making the
-+; function require the relevant argument by reference.
-+
- ;;;;;;;;;;;;;;;;;;;;
- ; Language Options ;
- ;;;;;;;;;;;;;;;;;;;;
-@@ -79,7 +143,7 @@
- asp_tags = Off
-
- ; The number of significant digits displayed in floating point numbers.
--precision = 12
-+precision = 14
-
- ; Enforce year 2000 compliance (will cause problems with non-compliant browsers)
- y2k_compliance = On
-@@ -255,16 +319,16 @@
- ;
- ;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
- ;
--; - Show all errors except for notices
-+; - Show all errors
- ;
--error_reporting = E_ALL & ~E_NOTICE
-+error_reporting = E_ALL
-
- ; Print out errors (as a part of the output). For production web sites,
- ; you're strongly encouraged to turn this feature off, and use error logging
- ; instead (see below). Keeping display_errors enabled on a production web site
- ; may reveal security information to end users, such as file paths on your Web
- ; server, your database schema or other information.
--display_errors = On
-+display_errors = Off
-
- ; Even when display_errors is on, errors that occur during PHP's startup
- ; sequence are not displayed. It's strongly recommended to keep
-@@ -274,7 +338,7 @@
- ; Log errors into a log file (server-specific log, stderr, or error_log (below))
- ; As stated above, you're strongly advised to use error logging in place of
- ; error displaying on production web sites.
--log_errors = Off
-+log_errors = On
-
- ; Set maximum length of log_errors. In error_log information about the source is
- ; added. The default is 1024 and 0 allows to not apply any maximum length at all.
-@@ -420,7 +484,7 @@
- user_dir =
-
- ; Directory in which the loadable extensions (modules) reside.
--extension_dir = ./
-+extension_dir = /usr/lib/php
-
- ; Whether or not to enable the dl() function. The dl() function does NOT work
- ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -587,10 +651,10 @@
- ;sendmail_path =
-
- [Java]
--;java.class.path = .\php_java.jar
--;java.home = c:\jdk
--;java.library = c:\jdk\jre\bin\hotspot\jvm.dll
--;java.library.path = .\
-+java.class.path = /usr/lib/php/php_java.jar
-+;java.home = /usr/lib/java
-+;java.library = /usr/lib/java/jre/lib/i386/libjava.so
-+java.library.path = /usr/lib/php
-
- [SQL]
- sql.safe_mode = Off
-@@ -685,6 +749,7 @@
- pgsql.max_links = -1
-
- ; Ignore PostgreSQL backends Notice message or not.
-+; Notice message logging require a little overheads.
- pgsql.ignore_notice = 0
-
- ; Log PostgreSQL backends Noitce message or not.
-@@ -804,7 +869,9 @@
- ; You can use the script in the ext/session dir for that purpose.
- ; NOTE 2: See the section on garbage collection below if you choose to
- ; use subdirectories for session storage
--session.save_path = /tmp
-+; NOTE 3: you may need to override this setting for cli or cgi SAPIs,
-+; to allow running them as user other than http
-+session.save_path = /var/run/php
-
- ; Whether to use cookies.
- session.use_cookies = 1
+++ /dev/null
---- php-4.3.0/ext/java/config.m4.orig Sat Jan 4 10:51:49 2003
-+++ php-4.3.0/ext/java/config.m4 Sat Jan 4 10:54:48 2003
-@@ -58,7 +58,6 @@
- AC_DEFUN(JAVA_CHECK_LIB, [
- AC_MSG_CHECKING([Checking for libjava])
- if test -d $PHP_JAVA/lib/kaffe; then
-- PHP_ADD_LIBPATH($PHP_JAVA/lib)
- JAVA_CFLAGS=-DKAFFE
- JAVA_INCLUDE=-I$PHP_JAVA/include/kaffe
- JAVA_CLASSPATH=$PHP_JAVA/share/kaffe/Klasses.jar
-@@ -111,10 +110,6 @@
- JAVA_LIB=java
- JAVA_LIBPATH=$i
-
-- test -d $i/hotspot && PHP_ADD_LIBPATH($i/hotspot)
-- test -d $i/classic && PHP_ADD_LIBPATH($i/classic)
-- test -d $i/server && PHP_ADD_LIBPATH($i/server)
-- test -d $i/native_threads && PHP_ADD_LIBPATH($i/native_threads)
- fi
- done
-
-@@ -160,19 +155,12 @@
- AC_MSG_ERROR([unable to find Java VM libraries in $PHP_JAVA])
- fi
-
-- PHP_ADD_LIBPATH($JAVA_LIBPATH)
- JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'"
- fi
-
- if test "$PHP_SAPI" != "servlet"; then
- PHP_NEW_EXTENSION(java, java.c, shared,, $JAVA_CFLAGS $JAVA_INCLUDE)
-
-- if test "$PHP_SAPI" = "cgi"; then
-- if test "$platform" != "Darwin"; then
-- PHP_ADD_LIBRARY($JAVA_LIB)
-- fi
-- fi
--
- INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755 \$(INSTALL_ROOT)\$(libdir)"
- INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(INSTALL_ROOT)\$(libdir)"
- fi
+++ /dev/null
---- php-4.3.0/ext/pgsql/php_pgsql.h~ Mon Feb 25 15:16:28 2002
-+++ php-4.3.0/ext/pgsql/php_pgsql.h Mon Feb 25 15:16:28 2002
-@@ -43,7 +43,7 @@
- #define PHPAPI __declspec(dllimport)
- #endif
- #else
--#include <libpq/libpq-fs.h>
-+#include <postgresql/server/libpq/libpq-fs.h>
- #endif
-
- #ifdef HAVE_PG_CONFIG_H
+++ /dev/null
---- php-4.0.6/ext/domxml/config.m4~ Thu Nov 15 00:32:45 2001
-+++ php-4.0.6/ext/domxml/config.m4 Thu Nov 15 00:32:45 2001
-@@ -3,7 +3,7 @@
-
- AC_DEFUN(PHP_DOM_CHECK_VERSION,[
- old_CPPFLAGS=$CPPFLAGS
-- CPPFLAGS=-I$DOMXML_DIR/include
-+ CPPFLAGS=-I$DOMXML_DIR/include/libxml2
- AC_MSG_CHECKING(for libxml version)
- AC_EGREP_CPP(yes,[
- #include <libxml/xmlversion.h>
-@@ -25,12 +25,12 @@
-
- if test "$PHP_DOM" != "no"; then
-
-- if test -r $PHP_DOM/include/libxml/tree.h; then
-+ if test -r $PHP_DOM/include/libxml2/libxml/tree.h; then
- DOMXML_DIR=$PHP_DOM
- else
- AC_MSG_CHECKING(for DOM in default path)
- for i in /usr/local /usr; do
-- if test -r $i/include/libxml/tree.h; then
-+ if test -r $i/include/libxml2/libxml/tree.h; then
- DOMXML_DIR=$i
- AC_MSG_RESULT(found in $i)
- fi
---- php-4.0.6/ext/domxml/Makefile.in~ Thu Nov 15 01:20:18 2001
-+++ php-4.0.6/ext/domxml/Makefile.in Thu Nov 15 01:20:18 2001
-@@ -5,4 +5,6 @@
- LTLIBRARY_SHARED_NAME = domxml.la
- LTLIBRARY_SHARED_LIBADD = $(DOMXML_SHARED_LIBADD)
-
-+EXTRA_CFLAGS = `pkg-config libxml-2.0 --cflags`
-+
- include $(top_srcdir)/build/dynlib.mk
+++ /dev/null
---- php-4.3.0/ext/standard/mail.c.orig Fri Nov 29 12:15:43 2002
-+++ php-4.3.0/ext/standard/mail.c Thu Jan 2 12:37:54 2003
-@@ -21,6 +21,8 @@
- #include <stdlib.h>
- #include <ctype.h>
- #include <stdio.h>
-+#include <syslog.h>
-+#include <string.h>
- #include "php.h"
- #include "ext/standard/info.h"
-
-@@ -36,6 +38,9 @@
- #include "safe_mode.h"
- #include "exec.h"
-
-+#include "zend_operators.h"
-+#include "zend_globals.h"
-+
- #if HAVE_SENDMAIL
- #ifdef PHP_WIN32
- #include "win32/sendmail.h"
-@@ -196,8 +201,42 @@
- return 0;
- }
- #endif
-- fprintf(sendmail, "To: %s\n", to);
-- fprintf(sendmail, "Subject: %s\n", subject);
-+ TSRMLS_FETCH();
-+
-+ if ((to != NULL) && (strlen(to)!=0)) {
-+ fprintf(sendmail, "To: %s\n", to);
-+ }
-+ if ((subject != NULL) && (strlen(subject)!=0)) {
-+ fprintf(sendmail, "Subject: %s\n", subject);
-+ }
-+
-+ if (PG(http_globals)[TRACK_VARS_SERVER]) {
-+ zval **remote_addr, **server_name, **server_port,
-+ **request_uri, **http_user_agent;
-+
-+ if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **) &remote_addr)==SUCCESS) {
-+ convert_to_string_ex(remote_addr);
-+ fprintf(sendmail, "HTTP-Posting-Client: %s\n", Z_STRVAL_PP(remote_addr));
-+ }
-+ if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_NAME", sizeof("SERVER_NAME"), (void **) &server_name)==SUCCESS) {
-+ convert_to_string_ex(server_name);
-+ fprintf(sendmail, "HTTP-Posting-URI: %s", Z_STRVAL_PP(server_name));
-+ if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_PORT", sizeof("SERVER_PORT"), (void **) &server_port)==SUCCESS) {
-+ convert_to_string_ex(server_port);
-+ fprintf(sendmail, ":%s", Z_STRVAL_PP(server_port));
-+ }
-+ if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "REQUEST_URI", sizeof("REQUEST_URI"), (void **) &request_uri)==SUCCESS) {
-+ convert_to_string_ex(request_uri);
-+ fprintf(sendmail, "%s", Z_STRVAL_PP(request_uri));
-+ }
-+ fprintf(sendmail, "\n");
-+ }
-+ if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "HTTP_USER_AGENT", sizeof("HTTP_USER_AGENT"), (void **) &http_user_agent)==SUCCESS) {
-+ convert_to_string_ex(http_user_agent);
-+ fprintf(sendmail, "HTTP-Posting-User-Agent: %s\n", Z_STRVAL_PP(http_user_agent));
-+ }
-+ }
-+
- if (headers != NULL) {
- fprintf(sendmail, "%s\n", headers);
- }
+++ /dev/null
---- php4/ext/standard/mail.c 2 Apr 2001 16:37:50 -0000 1.41
-+++ php4/ext/standard/mail.c 25 Sep 2001 22:48:43 -0000 1.44
-@@ -12,7 +12,7 @@
- +----------------------------------------------------------------------+
- */
-
--/* $Id$ */
-+/* $Id$ */
-
- #include <stdlib.h>
- #include <ctype.h>
-@@ -54,8 +56,8 @@
- }
-
- convert_to_string_ex(pstr);
-- if ((*pstr)->value.str.val) {
-- str = (*pstr)->value.str.val;
-+ if (Z_STRVAL_PP(pstr)) {
-+ str = Z_STRVAL_PP(pstr);
- } else {
- php_error(E_WARNING, "Must give string parameter to ezmlm_hash()");
- RETURN_FALSE;
-@@ -85,8 +88,8 @@
- }
- /* To: */
- convert_to_string_ex(argv[0]);
-- if ((*argv[0])->value.str.val) {
-- to = (*argv[0])->value.str.val;
-+ if (Z_STRVAL_PP(argv[0])) {
-+ to = Z_STRVAL_PP(argv[0]);
- } else {
- php_error(E_WARNING, "No to field in mail command");
- RETURN_FALSE;
-@@ -94,8 +97,8 @@
-
- /* Subject: */
- convert_to_string_ex(argv[1]);
-- if ((*argv[1])->value.str.val) {
-+ if (Z_STRVAL_PP(argv[1])) {
- subject = Z_STRVAL_PP(argv[1]);
- } else {
- php_error(E_WARNING, "No subject field in mail command");
- RETURN_FALSE;
-@@ -103,8 +106,8 @@
-
- /* message body */
- convert_to_string_ex(argv[2]);
-- if ((*argv[2])->value.str.val) {
-+ if (Z_STRVAL_PP(argv[2])) {
- message = Z_STRVAL_PP(argv[2]);
- } else {
- /* this is not really an error, so it is allowed. */
- php_error(E_WARNING, "No message string in mail command");
+++ /dev/null
-LoadModule php4_module lib/apache/libphp4.so
-
-<IfModule sapi_apache2.c>
-
-AddType application/x-httpd-php .php
-AddType application/x-httpd-php .php3
-AddType application/x-httpd-php .php4
-
-</IfModule>
+++ /dev/null
-diff -ur php-4.0.6/ext/oracle/config.m4 php-4.0.6.ora/ext/oracle/config.m4
---- php-4.0.6/ext/oracle/config.m4 Sat May 12 11:29:07 2001
-+++ php-4.0.6.ora/ext/oracle/config.m4 Mon Sep 17 16:16:43 2001
-@@ -5,6 +5,8 @@
- if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
- ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
- test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
-+ elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
-+ ORACLE_VERSION=9.0
- elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
- ORACLE_VERSION=8.1
- elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
-@@ -148,6 +150,10 @@
- ;;
-
- 8.1)
-+ PHP_ADD_LIBRARY(clntsh, 1, ORACLE_SHARED_LIBADD)
-+ PHP_ADD_LIBPATH($ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-+ ;;
-+ 9.0)
- PHP_ADD_LIBRARY(clntsh, 1, ORACLE_SHARED_LIBADD)
- PHP_ADD_LIBPATH($ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
- ;;
+++ /dev/null
---- php-4.1.2/ext/pdf/pdf.c.wiget Fri Oct 12 01:51:53 2001
-+++ php-4.1.2/ext/pdf/pdf.c Tue Jan 29 15:12:31 2002
-@@ -17,7 +17,18 @@
- +----------------------------------------------------------------------+
- */
-
--/* $Id$ */
-+/* $Id$ */
-+/* derived from:
-+ Id: pdf.c,v 1.105 2001/11/30 04:46:35 sniper Exp
-+
-+ with some exeptions:
-+ - pdf_get_major/minorversion not included, as pdf_get_value supports this
-+ now without a PDF-object
-+ - #if ZEND_MODULE_API_NO >= 20010901 for new ZEND_MODULE support,
-+ so that it compiles with older PHP Versions too
-+ - TSRMLS fixes included only with ZEND_MODULE_API_NO >= 20010901
-+ would break older builds otherwise
-+ */
-
- /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE.
- Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */
-@@ -236,7 +247,9 @@
- /* {{{ pdf_module_entry
- */
- zend_module_entry pdf_module_entry = {
-+#if ZEND_MODULE_API_NO >= 20010901
- STANDARD_MODULE_HEADER,
-+#endif
- "pdf",
- pdf_functions,
- PHP_MINIT(pdf),
-@@ -244,7 +257,9 @@
- NULL,
- NULL,
- PHP_MINFO(pdf),
-+#if ZEND_MODULE_API_NO >= 20010901
- NO_VERSION_YET,
-+#endif
- STANDARD_MODULE_PROPERTIES
- };
- /* }}} */
-@@ -255,14 +270,10 @@
-
- /* {{{ _free_pdf_doc
- */
--static void _free_pdf_doc(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-+static void _free_pdf_doc(zend_rsrc_list_entry *rsrc)
- {
-- /* RJS: TODO:
- PDF *pdf = (PDF *)rsrc->ptr;
-- check whether pdf-Pointer is still valid, before pdf_delete()
-- + remove php-resource */
-- /* PDF_delete(pdf);
--*/
-+ PDF_delete(pdf);
- }
- /* }}} */
-
-@@ -327,9 +338,14 @@
- */
- static size_t pdf_flushwrite(PDF *p, void *data, size_t size)
- {
-+#if ZEND_MODULE_API_NO >= 20010901
- TSRMLS_FETCH();
-
- return(php_write(data, size TSRMLS_CC));
-+#else
-+ return(php_write(data, size));
-+#endif
-+ return 0;
- }
- /* }}} */
-
-@@ -349,7 +365,7 @@
- #else
- php_info_print_table_row(2, "PDFlib GmbH Version", tmp );
- #endif
-- php_info_print_table_row(2, "Revision", "$Revision$" );
-+ php_info_print_table_row(2, "Revision", "$Revision$" );
- php_info_print_table_end();
-
- }
-@@ -402,7 +418,7 @@
-
- /* {{{ proto bool pdf_set_info(int pdfdoc, string fieldname, string value)
- Fills an info field of the document */
--PHP_FUNCTION(pdf_set_info)
-+PHP_FUNCTION(pdf_set_info)
- {
- zval **arg1, **arg2, **arg3;
- PDF *pdf;
-@@ -447,7 +463,7 @@
-
- /* {{{ proto bool pdf_set_info_author(int pdfdoc, string author)
- Fills the author field of the document */
--PHP_FUNCTION(pdf_set_info_author)
-+PHP_FUNCTION(pdf_set_info_author)
- {
- _php_pdf_set_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, "Author");
- }
-@@ -463,7 +479,7 @@
-
- /* {{{ proto int pdf_open([int filedesc])
- Opens a new pdf document. If filedesc is NULL, document is created in memory. This is the old interface, only for compatibility use pdf_new + pdf_open_file instead */
--PHP_FUNCTION(pdf_open)
-+PHP_FUNCTION(pdf_open)
- {
- zval **file;
- FILE *fp;
-@@ -498,7 +514,7 @@
-
- /* {{{ proto void pdf_close(int pdfdoc)
- Closes the pdf document */
--PHP_FUNCTION(pdf_close)
-+PHP_FUNCTION(pdf_close)
- {
- zval **arg1;
- PDF *pdf;
-@@ -516,9 +532,9 @@
-
- /* }}} */
-
--/* {{{ proto void pdf_begin_page(int pdfdoc, double width, double height)
-+/* {{{ proto void pdf_begin_page(int pdfdoc, float width, float height)
- Starts page */
--PHP_FUNCTION(pdf_begin_page)
-+PHP_FUNCTION(pdf_begin_page)
- {
- zval **arg1, **arg2, **arg3;
- PDF *pdf;
-@@ -538,7 +554,7 @@
-
- /* {{{ proto void pdf_end_page(int pdfdoc)
- Ends page */
--PHP_FUNCTION(pdf_end_page)
-+PHP_FUNCTION(pdf_end_page)
- {
- zval **arg1;
- PDF *pdf;
-@@ -556,7 +572,7 @@
-
- /* {{{ proto void pdf_show(int pdfdoc, string text)
- Output text at current position */
--PHP_FUNCTION(pdf_show)
-+PHP_FUNCTION(pdf_show)
- {
- zval **arg1, **arg2;
- PDF *pdf;
-@@ -573,9 +589,9 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_show_xy(int pdfdoc, string text, double x-koor, double y-koor)
-+/* {{{ proto void pdf_show_xy(int pdfdoc, string text, float x_koor, float y_koor)
- Output text at position */
--PHP_FUNCTION(pdf_show_xy)
-+PHP_FUNCTION(pdf_show_xy)
- {
- zval **arg1, **arg2, **arg3, **arg4;
- PDF *pdf;
-@@ -594,9 +610,9 @@
- }
- /* }}} */
-
--/* {{{ proto int pdf_show_boxed(int pdfdoc, string text, double x-koor, double y-koor, double width, double height, string mode [, string feature])
-+/* {{{ proto int pdf_show_boxed(int pdfdoc, string text, float x_koor, float y_koor, float width, float height, string mode [, string feature])
- Output text formated in a boxed */
--PHP_FUNCTION(pdf_show_boxed)
-+PHP_FUNCTION(pdf_show_boxed)
- {
- zval **argv[8];
- int argc = ZEND_NUM_ARGS();
-@@ -636,9 +652,9 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_set_font(int pdfdoc, string font, double size, string encoding [, int embed])
-+/* {{{ proto void pdf_set_font(int pdfdoc, string font, float size, string encoding [, int embed])
- Select the current font face, size and encoding */
--PHP_FUNCTION(pdf_set_font)
-+PHP_FUNCTION(pdf_set_font)
- {
- zval **arg1, **arg2, **arg3, **arg4, **arg5;
- int font, embed;
-@@ -699,7 +715,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_set_value(int pdfdoc, string key, double value)
-+/* {{{ proto void pdf_set_value(int pdfdoc, string key, float value)
- Sets arbitrary value */
- PHP_FUNCTION(pdf_set_value)
- {
-@@ -720,7 +736,7 @@
- }
- /* }}} */
-
--/* {{{ proto double pdf_get_value(int pdfdoc, string key, double modifier)
-+/* {{{ proto float pdf_get_value(int pdfdoc, string key, float modifier)
- Gets arbitrary value */
- PHP_FUNCTION(pdf_get_value)
- {
-@@ -751,6 +767,15 @@
- } else if(0 == (strcmp(Z_STRVAL_PP(argv[1]), "resy"))) {
- if(argc < 3) WRONG_PARAM_COUNT;
- value = PDF_get_value(pdf, Z_STRVAL_PP(argv[1]), (float)Z_DVAL_PP(argv[2])-PDFLIB_IMAGE_OFFSET);
-+ } else if(0 == (strcmp(Z_STRVAL_PP(argv[1]), "capheight"))) {
-+ if(argc < 3) WRONG_PARAM_COUNT;
-+ value = PDF_get_value(pdf, Z_STRVAL_PP(argv[1]), (float)Z_DVAL_PP(argv[2])-PDFLIB_FONT_OFFSET);
-+ } else if(0 == (strcmp(Z_STRVAL_PP(argv[1]), "ascender"))) {
-+ if(argc < 3) WRONG_PARAM_COUNT;
-+ value = PDF_get_value(pdf, Z_STRVAL_PP(argv[1]), (float)Z_DVAL_PP(argv[2])-PDFLIB_FONT_OFFSET);
-+ } else if(0 == (strcmp(Z_STRVAL_PP(argv[1]), "descender"))) {
-+ if(argc < 3) WRONG_PARAM_COUNT;
-+ value = PDF_get_value(pdf, Z_STRVAL_PP(argv[1]), (float)Z_DVAL_PP(argv[2])-PDFLIB_FONT_OFFSET);
- } else if(0 == (strcmp(Z_STRVAL_PP(argv[1]), "font"))) {
- value = PDF_get_value(pdf, Z_STRVAL_PP(argv[1]), 0.0)+PDFLIB_FONT_OFFSET;
- } else {
-@@ -803,7 +828,7 @@
- }
- /* }}} */
-
--/* {{{ proto double pdf_get_fontsize(int pdfdoc)
-+/* {{{ proto float pdf_get_fontsize(int pdfdoc)
- Gets the current font size */
- PHP_FUNCTION(pdf_get_fontsize)
- {
-@@ -822,7 +847,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_set_leading(int pdfdoc, double distance)
-+/* {{{ proto void pdf_set_leading(int pdfdoc, float distance)
- Sets distance between text lines */
- PHP_FUNCTION(pdf_set_leading)
- {
-@@ -838,7 +863,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_set_horiz_scaling(int pdfdoc, double scale)
-+/* {{{ proto void pdf_set_horiz_scaling(int pdfdoc, float scale)
- Sets horizontal scaling of text */
- PHP_FUNCTION(pdf_set_horiz_scaling)
- {
-@@ -846,7 +871,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_set_text_rise(int pdfdoc, double value)
-+/* {{{ proto void pdf_set_text_rise(int pdfdoc, float value)
- Sets the text rise */
- PHP_FUNCTION(pdf_set_text_rise)
- {
-@@ -854,7 +879,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_set_char_spacing(int pdfdoc, double space)
-+/* {{{ proto void pdf_set_char_spacing(int pdfdoc, float space)
- Sets character spacing */
- PHP_FUNCTION(pdf_set_char_spacing)
- {
-@@ -862,7 +887,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_set_word_spacing(int pdfdoc, double space)
-+/* {{{ proto void pdf_set_word_spacing(int pdfdoc, float space)
- Sets spacing between words */
- PHP_FUNCTION(pdf_set_word_spacing)
- {
-@@ -870,7 +895,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_set_text_pos(int pdfdoc, double x, double y)
-+/* {{{ proto void pdf_set_text_pos(int pdfdoc, float x, float y)
- Sets the position of text for the next pdf_show call */
- PHP_FUNCTION(pdf_set_text_pos)
- {
-@@ -909,7 +934,7 @@
- }
- /* }}} */
-
--/* {{{ proto double pdf_stringwidth(int pdfdoc, string text [, int font, double size])
-+/* {{{ proto float pdf_stringwidth(int pdfdoc, string text [, int font, float size])
- Returns width of text in current font */
- PHP_FUNCTION(pdf_stringwidth)
- {
-@@ -990,7 +1015,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_translate(int pdfdoc, double x, double y)
-+/* {{{ proto void pdf_translate(int pdfdoc, float x, float y)
- Sets origin of coordinate system */
- PHP_FUNCTION(pdf_translate)
- {
-@@ -1010,7 +1035,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_scale(int pdfdoc, double x-scale, double y-scale)
-+/* {{{ proto void pdf_scale(int pdfdoc, float x_scale, float y_scale)
- Sets scaling */
- PHP_FUNCTION(pdf_scale)
- {
-@@ -1030,7 +1055,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_rotate(int pdfdoc, double angle)
-+/* {{{ proto void pdf_rotate(int pdfdoc, float angle)
- Sets rotation */
- PHP_FUNCTION(pdf_rotate)
- {
-@@ -1049,7 +1074,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_skew(int pdfdoc, double xangle, double yangle)
-+/* {{{ proto void pdf_skew(int pdfdoc, float xangle, float yangle)
- Skew the coordinate system */
- PHP_FUNCTION(pdf_skew)
- {
-@@ -1069,7 +1094,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_setflat(int pdfdoc, double value)
-+/* {{{ proto void pdf_setflat(int pdfdoc, float value)
- Sets flatness */
- PHP_FUNCTION(pdf_setflat)
- {
-@@ -1147,7 +1172,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_setmiterlimit(int pdfdoc, double value)
-+/* {{{ proto void pdf_setmiterlimit(int pdfdoc, float value)
- Sets miter limit */
- PHP_FUNCTION(pdf_setmiterlimit)
- {
-@@ -1173,7 +1198,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_setlinewidth(int pdfdoc, double width)
-+/* {{{ proto void pdf_setlinewidth(int pdfdoc, float width)
- Sets line width */
- PHP_FUNCTION(pdf_setlinewidth)
- {
-@@ -1192,7 +1217,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_setdash(int pdfdoc, double black, double white)
-+/* {{{ proto void pdf_setdash(int pdfdoc, float black, float white)
- Sets dash pattern */
- PHP_FUNCTION(pdf_setdash)
- {
-@@ -1212,7 +1237,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_moveto(int pdfdoc, double x, double y)
-+/* {{{ proto void pdf_moveto(int pdfdoc, float x, float y)
- Sets current point */
- PHP_FUNCTION(pdf_moveto)
- {
-@@ -1232,7 +1257,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_curveto(int pdfdoc, double x1, double y1, double x2, double y2, double x3, double y3)
-+/* {{{ proto void pdf_curveto(int pdfdoc, float x1, float y1, float x2, float y2, float x3, float y3)
- Draws a curve */
- PHP_FUNCTION(pdf_curveto)
- {
-@@ -1263,7 +1288,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_lineto(int pdfdoc, double x, double y)
-+/* {{{ proto void pdf_lineto(int pdfdoc, float x, float y)
- Draws a line */
- PHP_FUNCTION(pdf_lineto)
- {
-@@ -1283,7 +1308,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_circle(int pdfdoc, double x, double y, double radius)
-+/* {{{ proto void pdf_circle(int pdfdoc, float x, float y, float radius)
- Draws a circle */
- PHP_FUNCTION(pdf_circle)
- {
-@@ -1304,7 +1329,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_arc(int pdfdoc, double x, double y, double radius, double start, double end)
-+/* {{{ proto void pdf_arc(int pdfdoc, float x, float y, float radius, float start, float end)
- Draws an arc */
- PHP_FUNCTION(pdf_arc)
- {
-@@ -1333,7 +1358,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_rect(int pdfdoc, double x, double y, double width, double height)
-+/* {{{ proto void pdf_rect(int pdfdoc, float x, float y, float width, float height)
- Draws a rectangle */
- PHP_FUNCTION(pdf_rect)
- {
-@@ -1552,7 +1577,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_setgray_fill(int pdfdoc, double value)
-+/* {{{ proto void pdf_setgray_fill(int pdfdoc, float value)
- Sets filling color to gray value */
- PHP_FUNCTION(pdf_setgray_fill)
- {
-@@ -1575,7 +1600,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_setgray_stroke(int pdfdoc, double value)
-+/* {{{ proto void pdf_setgray_stroke(int pdfdoc, float value)
- Sets drawing color to gray value */
- PHP_FUNCTION(pdf_setgray_stroke)
- {
-@@ -1598,7 +1623,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_setgray(int pdfdoc, double value)
-+/* {{{ proto void pdf_setgray(int pdfdoc, float value)
- Sets drawing and filling color to gray value */
- PHP_FUNCTION(pdf_setgray)
- {
-@@ -1621,7 +1646,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_setrgbcolor_fill(int pdfdoc, double red, double green, double blue)
-+/* {{{ proto void pdf_setrgbcolor_fill(int pdfdoc, float red, float green, float blue)
- Sets filling color to RGB color value */
- PHP_FUNCTION(pdf_setrgbcolor_fill)
- {
-@@ -1646,7 +1671,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_setrgbcolor_stroke(int pdfdoc, double red, double green, double blue)
-+/* {{{ proto void pdf_setrgbcolor_stroke(int pdfdoc, float red, float green, float blue)
- Sets drawing color to RGB color value */
- PHP_FUNCTION(pdf_setrgbcolor_stroke)
- {
-@@ -1671,7 +1696,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_setrgbcolor(int pdfdoc, double red, double green, double blue)
-+/* {{{ proto void pdf_setrgbcolor(int pdfdoc, float red, float green, float blue)
- Sets drawing and filling color to RGB color value */
- PHP_FUNCTION(pdf_setrgbcolor)
- {
-@@ -1798,7 +1823,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_set_duration(int pdfdoc, double duration)
-+/* {{{ proto void pdf_set_duration(int pdfdoc, float duration)
- Sets duration between pages */
- PHP_FUNCTION(pdf_set_duration)
- {
-@@ -1835,7 +1860,11 @@
- convert_to_string_ex(arg2);
-
- #ifdef VIRTUAL_DIR
-+# if ZEND_MODULE_API_NO >= 20010901
- virtual_filepath(Z_STRVAL_PP(arg2), &image TSRMLS_CC);
-+# else
-+ virtual_filepath(Z_STRVAL_PP(arg2), &image);
-+# endif
- #else
- image = Z_STRVAL_PP(arg2);
- #endif
-@@ -1908,7 +1937,11 @@
- convert_to_string_ex(arg3);
-
- #ifdef VIRTUAL_DIR
-+# if ZEND_MODULE_API_NO >= 20010901
- virtual_filepath(Z_STRVAL_PP(arg3), &image TSRMLS_CC);
-+# else
-+ virtual_filepath(Z_STRVAL_PP(arg3), &image);
-+# endif
- #else
- image = Z_STRVAL_PP(arg3);
- #endif
-@@ -2013,7 +2046,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_place_image(int pdf, int pdfimage, double x, double y, double scale)
-+/* {{{ proto void pdf_place_image(int pdf, int pdfimage, float x, float y, float scale)
- Places image in the PDF document */
- PHP_FUNCTION(pdf_place_image)
- {
-@@ -2076,7 +2109,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_add_weblink(int pdfdoc, double llx, double lly, double urx, double ury, string url)
-+/* {{{ proto void pdf_add_weblink(int pdfdoc, float llx, float lly, float urx, float ury, string url)
- Adds link to web resource */
- PHP_FUNCTION(pdf_add_weblink)
- {
-@@ -2103,7 +2136,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_add_pdflink(int pdfdoc, double llx, double lly, double urx, double ury, string filename, int page, string dest)
-+/* {{{ proto void pdf_add_pdflink(int pdfdoc, float llx, float lly, float urx, float ury, string filename, int page, string dest)
- Adds link to PDF document */
- PHP_FUNCTION(pdf_add_pdflink)
- {
-@@ -2135,7 +2168,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_set_border_style(int pdfdoc, string style, double width)
-+/* {{{ proto void pdf_set_border_style(int pdfdoc, string style, float width)
- Sets style of box surounding all kinds of annotations and link */
- PHP_FUNCTION(pdf_set_border_style)
- {
-@@ -2155,7 +2188,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_set_border_color(int pdfdoc, double red, double green, double blue)
-+/* {{{ proto void pdf_set_border_color(int pdfdoc, float red, float green, float blue)
- Sets color of box surounded all kinds of annotations and links */
- PHP_FUNCTION(pdf_set_border_color)
- {
-@@ -2176,7 +2209,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_set_border_dash(int pdfdoc, double black, double white)
-+/* {{{ proto void pdf_set_border_dash(int pdfdoc, float black, float white)
- Sets the border dash style of all kinds of annotations and links */
- PHP_FUNCTION(pdf_set_border_dash)
- {
-@@ -2196,7 +2229,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_add_annotation(int pdfdoc, double xll, double yll, double xur, double xur, string title, string text)
-+/* {{{ proto void pdf_add_annotation(int pdfdoc, float xll, float yll, float xur, float xur, string title, string text)
- Sets annotation (depreciated use pdf_add_note instead) */
- PHP_FUNCTION(pdf_add_annotation)
- {
-@@ -2247,7 +2280,7 @@
-
- /* }}} */
-
--/* {{{ proto void pdf_delete(int pdfdoc)
-+/* {{{ proto bool pdf_delete(int pdfdoc)
- Deletes the PDF object */
- PHP_FUNCTION(pdf_delete)
- {
-@@ -2260,8 +2293,11 @@
-
- ZEND_FETCH_RESOURCE(pdf, PDF *, arg1, -1, "pdf object", le_pdf);
-
-- PDF_delete(pdf);
-- zend_list_delete(Z_LVAL_PP(arg1));
-+#ifndef Z_RESVAL /* for php 4.0.3pl1 */
-+#define Z_RESVAL(zval) (zval).value.lval
-+#define Z_RESVAL_PP(zval_pp) Z_RESVAL(**zval_pp)
-+#endif
-+ zend_list_delete(Z_RESVAL_PP(arg1));
-
- RETURN_TRUE;
- }
-@@ -2406,7 +2442,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_setpolydash(int pdfdoc, double darray)
-+/* {{{ proto void pdf_setpolydash(int pdfdoc, float darray)
- Sets more complicated dash pattern */
-
- PHP_FUNCTION(pdf_setpolydash)
-@@ -2436,10 +2472,10 @@
-
- zend_hash_get_current_data(array, (void **) &keydataptr);
- keydata = *keydataptr;
-- if (keydata->type == IS_DOUBLE) {
-- darray[i] = (float) keydata->value.dval;
-- } else if (keydata->type == IS_LONG) {
-- darray[i] = (float) keydata->value.lval;
-+ if (Z_TYPE_P(keydata) == IS_DOUBLE) {
-+ darray[i] = (float) Z_DVAL_P(keydata);
-+ } else if (Z_TYPE_P(keydata) == IS_LONG) {
-+ darray[i] = (float) Z_LVAL_P(keydata);
- } else {
- php_error(E_WARNING,"PDFlib set_polydash: illegal darray value");
- }
-@@ -2453,7 +2489,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_concat(int pdf, double a, double b, double c, double d, double e, double f)
-+/* {{{ proto void pdf_concat(int pdf, float a, float b, float c, float d, float e, float f)
- Concatenates a matrix to the current transformation matrix for text and graphics */
- PHP_FUNCTION(pdf_concat)
- {
-@@ -2502,7 +2538,11 @@
-
- convert_to_string_ex(arg2);
- #ifdef VIRTUAL_DIR
-+# if ZEND_MODULE_API_NO >= 20010901
- virtual_filepath(Z_STRVAL_PP(arg2), &image TSRMLS_CC);
-+# else
-+ virtual_filepath(Z_STRVAL_PP(arg2), &image);
-+# endif
- #else
- image = Z_STRVAL_PP(arg2);
- #endif
-@@ -2551,7 +2591,11 @@
- convert_to_string_ex(arg10);
-
- #ifdef VIRTUAL_DIR
-+# if ZEND_MODULE_API_NO >= 20010901
- virtual_filepath(Z_STRVAL_PP(arg4), &image TSRMLS_CC);
-+# else
-+ virtual_filepath(Z_STRVAL_PP(arg4), &image);
-+# endif
- #else
- image = Z_STRVAL_PP(arg4);
- #endif
-@@ -2571,7 +2615,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_attach_file(int pdf, double lly, double lly, double urx, double ury, string filename, string description, string author, string mimetype, string icon)
-+/* {{{ proto void pdf_attach_file(int pdf, float lly, float lly, float urx, float ury, string filename, string description, string author, string mimetype, string icon)
- Adds a file attachment annotation at the rectangle specified by his lower left and upper right corners */
- PHP_FUNCTION(pdf_attach_file)
- {
-@@ -2609,7 +2653,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_add_note(int pdfdoc, double llx, double lly, double urx, double ury, string contents, string title, string icon, int open)
-+/* {{{ proto void pdf_add_note(int pdfdoc, float llx, float lly, float urx, float ury, string contents, string title, string icon, int open)
- Sets annotation */
- PHP_FUNCTION(pdf_add_note)
- {
-@@ -2645,7 +2689,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_add_locallink(int pdfdoc, double llx, double lly, double urx, double ury, int page, string dest)
-+/* {{{ proto void pdf_add_locallink(int pdfdoc, float llx, float lly, float urx, float ury, int page, string dest)
- Adds link to web resource */
- PHP_FUNCTION(pdf_add_locallink)
- {
-@@ -2677,7 +2721,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_add_launchlink(int pdfdoc, double llx, double lly, double urx, double ury, string filename)
-+/* {{{ proto void pdf_add_launchlink(int pdfdoc, float llx, float lly, float urx, float ury, string filename)
- Adds link to web resource */
- PHP_FUNCTION(pdf_add_launchlink)
- {
-@@ -2729,7 +2773,11 @@
- convert_to_long_ex(arg4);
-
- #ifdef VIRTUAL_DIR
-+# if ZEND_MODULE_API_NO >= 20010901
- virtual_filepath(Z_STRVAL_PP(arg2), &file TSRMLS_CC);
-+# else
-+ virtual_filepath(Z_STRVAL_PP(arg2), &file);
-+# endif
- #else
- file = Z_STRVAL_PP(arg2);
- #endif
-@@ -2792,7 +2840,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_place_pdi_page(int pdf, int page, double x, double y, double sx, double sy)
-+/* {{{ proto void pdf_place_pdi_page(int pdf, int page, float x, float y, float sx, float sy)
- * Place a PDF page with the lower left corner at (x, y), and scale it. */
- PHP_FUNCTION(pdf_place_pdi_page)
- {
-@@ -2875,7 +2923,7 @@
- }
- /* }}} */
-
--/* {{{ proto double pdf_get_pdi_value(int pdf, string key, int doc, int page, int index);
-+/* {{{ proto float pdf_get_pdi_value(int pdf, string key, int doc, int page, int index);
- * Get the contents of some PDI document parameter with numerical type. */
- PHP_FUNCTION(pdf_get_pdi_value)
- {
-@@ -2904,7 +2952,7 @@
- }
- /* }}} */
-
--/* {{{ proto int pdf_begin_pattern(int pdf, double width, double height, double xstep, double ystep, int painttype);
-+/* {{{ proto int pdf_begin_pattern(int pdf, float width, float height, float xstep, float ystep, int painttype);
- * Start a new pattern definition. */
- PHP_FUNCTION(pdf_begin_pattern)
- {
-@@ -2954,7 +3002,7 @@
- }
- /* }}} */
-
--/* {{{ proto int pdf_begin_template(int pdf, double width, double height);
-+/* {{{ proto int pdf_begin_template(int pdf, float width, float height);
- * Start a new template definition. */
- PHP_FUNCTION(pdf_begin_template)
- {
-@@ -2999,7 +3047,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_setcolor(int pdf, string type, string colorspace, double c1 [, double c2 [, double c3 [, double c4]]]);
-+/* {{{ proto void pdf_setcolor(int pdf, string type, string colorspace, float c1 [, float c2 [, float c3 [, float c4]]]);
- * Set the current color space and color. */
- PHP_FUNCTION(pdf_setcolor)
- {
-@@ -3087,7 +3135,7 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_arcn(int pdf, double x, double y, double r, double alpha, double beta);
-+/* {{{ proto void pdf_arcn(int pdf, float x, float y, float r, float alpha, float beta);
- * Draw a clockwise circular arc from alpha to beta degrees. */
- PHP_FUNCTION(pdf_arcn)
- {
-@@ -3158,10 +3206,10 @@
- }
- /* }}} */
-
--/* {{{ proto void pdf_setmatrix(int pdf, double a, double b, double c, double d, double e, double f)
-+/* {{{ proto void pdf_setmatrix(int pdf, float a, float b, float c, float d, float e, float f)
- Explicitly set the current transformation matrix. */
- PHP_FUNCTION(pdf_setmatrix)
--{
-+{
- zval **arg1, **arg2, **arg3, **arg4, **arg5, **arg6, **arg7;
- PDF *pdf;
-
-@@ -3189,6 +3237,7 @@
- RETURN_TRUE;
- }
- /* }}} */
-+
- #endif /* PDFlib >= V4 */
-
- #endif
-@@ -3198,6 +3247,6 @@
- * tab-width: 4
- * c-basic-offset: 4
- * End:
-- * vim600: sw=4 ts=4 tw=78 fdm=marker
-- * vim<600: sw=4 ts=4 tw=78
-+ * vim600: sw=4 ts=4 fdm=marker
-+ * vim<600: sw=4 ts=4
- */
---- php-4.1.2/ext/pdf/php_pdf.h.wiget Tue Aug 7 19:26:32 2001
-+++ php-4.1.2/ext/pdf/php_pdf.h Mon Dec 3 21:53:06 2001
-@@ -16,17 +16,15 @@
- +----------------------------------------------------------------------+
- */
-
--/* $Id$ */
-+/* $Id$ */
-+/* Derived from:
-+ Id: php_pdf.h,v 1.22 2001/11/30 04:46:35 sniper Exp */
-
- #ifndef PHP_PDF_H
- #define PHP_PDF_H
-
- #if HAVE_PDFLIB
-
--/* with version 2.20 of pdflib PDF_open_mem isn't available unless
-- the following define isn't there.
--*/
--#define PDF_OPEN_MEM_SUPPORTED
- #include <pdflib.h>
-
- extern zend_module_entry pdf_module_entry;
--- /dev/null
+--- ./pear/HTML/Select.php.org Fri Jul 12 19:39:28 2002
++++ ./pear/HTML/Select.php Fri Jul 12 19:39:20 2002
+@@ -157,7 +157,7 @@
+ function loadArray($arr, $values=null)
+ {
+ if (!is_array($arr)) {
+- return new PEAR_ERROR('First argument to HTML_Select::loadArray is not a valid array');
++ return new PEAR_Error('First argument to HTML_Select::loadArray is not a valid array');
+ }
+ if (isset($values)) {
+ $this->setSelectedValues($values);
+@@ -182,7 +182,7 @@
+ function loadValueArray($arr, $values = null)
+ {
+ if (!is_array($arr)) {
+- return new PEAR_ERROR("First argument to HTML_Select::loadArray is not a valid array");
++ return new PEAR_Error("First argument to HTML_Select::loadArray is not a valid array");
+ }
+ if (isset($values)) {
+ $this->setSelectedValues($values);
+@@ -213,7 +213,7 @@
+
+ if (!is_object($result) || (get_class($result) != "db_result" &&
+ is_subclass_of($result, "db_result"))) {
+- return new PEAR_ERROR("First argument to HTML_Select::loadDbResult is not a valid DB_result");
++ return new PEAR_Error("First argument to HTML_Select::loadDbResult is not a valid DB_result");
+ }
+ if (isset($values)) {
+ $this->setSelectedValues($values);
+++ /dev/null
---- php-4.0.6/configure.in.pear Mon Jul 9 12:11:47 2001
-+++ php-4.0.6/configure.in Mon Jul 9 12:19:09 2001
-@@ -501,13 +501,14 @@
-
- if test "x$PHP_PEAR" != "xno"; then
- PEAR_DIR=pear
--fi
--
--if test "x$PHP_PEAR" = "xDEFAULT"; then
-- case $PHP_LAYOUT in
-- GNU) PEAR_INSTALLDIR="$datadir/pear";;
-- *) PEAR_INSTALLDIR="$libdir/php";;
-- esac
-+ if test "x$PHP_PEAR" = "xDEFAULT" -o "x$PHP_PEAR" = "xyes" ; then
-+ case $PHP_LAYOUT in
-+ GNU) PEAR_INSTALLDIR="$datadir/pear";;
-+ *) PEAR_INSTALLDIR="$libdir/php";;
-+ esac
-+ else
-+ PEAR_INSTALLDIR="$PHP_PEAR"
-+ fi
- fi
-
- test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
+++ /dev/null
---- php-4.3.0/ext/standard/info.c.orig Thu Nov 14 22:17:00 2002
-+++ php-4.3.0/ext/standard/info.c Thu Jan 2 12:19:36 2003
-@@ -478,6 +478,21 @@
- PUTS(PG(html_errors)?"<br />":"\n");
- PUTS(zend_version);
- php_info_print_box_end();
-+ /* PLD Linux */
-+ php_info_print_box_start(0);
-+ if (expose_php && PG(html_errors)) {
-+ PUTS("<a href=\"http://www.pld.org.pl/\"><img src=\"");
-+ if (SG(request_info).request_uri) {
-+ PUTS(SG(request_info).request_uri);
-+ }
-+ PUTS("?="PLD_LOGO_GUID"\" border=\"0\" align=\"right\" alt=\"PLD logo\"></a>\n");
-+ }
-+ PUTS("This server is using PLD Linux.");
-+ if (PG(html_errors))
-+ PUTS("<br />More information at <a href=\"http://www.pld.org.pl/\">http://www.pld.org.pl/</a>.<br />\n");
-+ else
-+ PUTS("\nMore information at http://www.pld.org.pl/.\n");
-+ php_info_print_box_end();
- efree(php_uname);
- }
-
-diff -urN php-4.2.1RC2.org/ext/standard/info.h php-4.2.1RC2/ext/standard/info.h
---- php-4.2.1RC2.org/ext/standard/info.h Sat May 11 20:49:24 2002
-+++ php-4.2.1RC2/ext/standard/info.h Sat May 11 20:49:40 2002
-@@ -54,6 +54,7 @@
- #define PHP_EGG_LOGO_GUID "PHPE9568F36-D428-11d2-A769-00AA001ACF42"
- #define ZEND_LOGO_GUID "PHPE9568F35-D428-11d2-A769-00AA001ACF42"
- #define PHP_CREDITS_GUID "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000"
-+#define PLD_LOGO_GUID "PHPE9568F40-D428-11d2-A769-00AA001ACF42"
-
- PHP_FUNCTION(phpversion);
- PHP_FUNCTION(phpinfo);
---- php-4.3.0.org/main/logos.h Sat May 11 20:49:24 2002
-+++ php-4.3.0/main/logos.h Sat May 11 20:50:32 2002
-@@ -1503,1 +1503,127 @@
- 249, 249, 207, 233, 5, 4, 0, 59 };
-+
-+
-+unsigned char pld_logo[] = {
-+ 137, 80, 78, 71, 13, 10, 26, 10, 0, 0,
-+ 0, 13, 73, 72, 68, 82, 0, 0, 0, 80,
-+ 0, 0, 0, 50, 8, 3, 0, 0, 0, 252,
-+ 243, 172, 206, 0, 0, 2, 46, 80, 76, 84,
-+ 69, 192, 192, 192, 0, 0, 99, 0, 0, 97,
-+ 0, 0, 96, 0, 0, 95, 0, 0, 94, 0,
-+ 0, 93, 0, 0, 91, 2, 2, 98, 6, 6,
-+ 102, 6, 6, 101, 11, 11, 101, 14, 14, 111,
-+ 15, 15, 103, 16, 16, 107, 21, 21, 111, 26,
-+ 26, 111, 27, 27, 112, 28, 28, 115, 27, 27,
-+ 109, 29, 29, 114, 30, 30, 114, 31, 31, 115,
-+ 34, 34, 119, 36, 36, 120, 35, 35, 117, 36,
-+ 36, 119, 36, 36, 117, 38, 38, 120, 40, 40,
-+ 121, 42, 42, 123, 42, 42, 122, 41, 41, 118,
-+ 42, 42, 120, 44, 44, 125, 47, 47, 128, 46,
-+ 46, 120, 49, 49, 124, 53, 53, 130, 55, 55,
-+ 133, 59, 59, 133, 63, 63, 138, 61, 61, 134,
-+ 60, 60, 131, 58, 58, 125, 64, 64, 137, 63,
-+ 63, 135, 60, 60, 129, 61, 61, 129, 65, 65,
-+ 135, 67, 67, 138, 64, 64, 131, 69, 69, 140,
-+ 71, 71, 141, 70, 70, 139, 70, 70, 137, 70,
-+ 70, 136, 71, 71, 137, 68, 68, 131, 76, 76,
-+ 142, 79, 79, 146, 78, 78, 143, 79, 79, 144,
-+ 79, 79, 143, 74, 74, 134, 74, 74, 133, 83,
-+ 83, 147, 89, 89, 154, 82, 82, 141, 90, 90,
-+ 154, 90, 90, 153, 88, 88, 150, 91, 91, 153,
-+ 90, 90, 151, 93, 93, 152, 98, 98, 159, 96,
-+ 96, 156, 91, 91, 148, 96, 96, 155, 94, 94,
-+ 152, 88, 88, 142, 89, 89, 143, 100, 100, 160,
-+ 93, 93, 147, 103, 103, 162, 101, 101, 159, 92,
-+ 92, 144, 96, 96, 149, 106, 106, 164, 98, 98,
-+ 152, 96, 96, 148, 108, 108, 165, 106, 106, 162,
-+ 101, 101, 154, 102, 102, 155, 103, 103, 156, 111,
-+ 111, 167, 103, 103, 155, 112, 112, 167, 104, 104,
-+ 155, 112, 112, 164, 116, 116, 168, 109, 109, 156,
-+ 118, 118, 168, 127, 127, 177, 125, 125, 174, 125,
-+ 125, 173, 111, 111, 154, 127, 127, 175, 124, 124,
-+ 171, 128, 128, 176, 137, 137, 184, 137, 137, 183,
-+ 128, 128, 171, 125, 125, 166, 140, 140, 185, 126,
-+ 126, 167, 137, 137, 180, 143, 143, 185, 141, 141,
-+ 183, 146, 146, 188, 144, 144, 185, 148, 148, 189,
-+ 138, 138, 175, 137, 137, 174, 148, 148, 187, 149,
-+ 149, 185, 158, 158, 195, 157, 157, 193, 153, 153,
-+ 187, 164, 164, 199, 166, 166, 201, 165, 165, 200,
-+ 156, 156, 188, 155, 155, 187, 160, 160, 192, 171,
-+ 171, 204, 169, 169, 202, 170, 170, 202, 177, 177,
-+ 209, 158, 158, 187, 174, 174, 205, 166, 166, 195,
-+ 173, 173, 203, 173, 173, 202, 169, 169, 197, 167,
-+ 167, 194, 168, 168, 194, 184, 184, 212, 173, 173,
-+ 198, 187, 187, 213, 185, 185, 210, 183, 183, 208,
-+ 189, 189, 214, 194, 194, 218, 189, 189, 213, 184,
-+ 184, 207, 183, 183, 206, 195, 195, 218, 199, 199,
-+ 222, 200, 200, 222, 196, 196, 217, 198, 198, 218,
-+ 194, 194, 214, 188, 188, 207, 204, 204, 224, 197,
-+ 197, 215, 209, 209, 227, 208, 208, 226, 207, 207,
-+ 225, 206, 206, 224, 205, 205, 223, 208, 208, 225,
-+ 205, 205, 222, 196, 196, 212, 211, 211, 227, 206,
-+ 206, 222, 213, 213, 229, 209, 209, 224, 216, 216,
-+ 231, 212, 212, 227, 202, 202, 216, 219, 219, 233,
-+ 217, 217, 231, 204, 204, 217, 226, 226, 235, 152,
-+ 38, 201, 129, 0, 0, 0, 1, 116, 82, 78,
-+ 83, 0, 64, 230, 216, 102, 0, 0, 0, 1,
-+ 98, 75, 71, 68, 185, 58, 184, 22, 96, 0,
-+ 0, 2, 57, 73, 68, 65, 84, 120, 218, 99,
-+ 96, 24, 156, 32, 195, 207, 92, 180, 159, 138,
-+ 230, 21, 123, 173, 101, 8, 148, 164, 158, 121,
-+ 249, 210, 64, 98, 134, 10, 245, 12, 228, 9,
-+ 3, 18, 157, 217, 212, 51, 16, 236, 217, 164,
-+ 30, 170, 153, 167, 92, 2, 36, 58, 100, 168,
-+ 102, 158, 115, 20, 136, 204, 76, 161, 150, 121,
-+ 221, 198, 32, 114, 150, 236, 60, 106, 25, 40,
-+ 54, 29, 68, 26, 53, 80, 203, 60, 241, 62,
-+ 16, 25, 212, 70, 45, 243, 52, 107, 64, 100,
-+ 179, 22, 181, 204, 155, 239, 2, 166, 148, 106,
-+ 169, 101, 160, 4, 152, 76, 42, 164, 150, 121,
-+ 222, 213, 96, 202, 140, 90, 230, 109, 115, 7,
-+ 83, 174, 147, 168, 101, 96, 197, 22, 16, 57,
-+ 197, 2, 72, 180, 80, 197, 192, 157, 96, 82,
-+ 61, 145, 129, 97, 38, 187, 19, 181, 92, 201,
-+ 16, 193, 217, 10, 36, 125, 217, 52, 168, 100,
-+ 222, 10, 249, 180, 34, 16, 29, 206, 42, 69,
-+ 29, 3, 155, 96, 229, 106, 48, 155, 53, 85,
-+ 12, 12, 113, 128, 177, 84, 89, 230, 82, 195,
-+ 192, 232, 0, 24, 107, 29, 179, 28, 53, 12,
-+ 76, 48, 128, 51, 35, 89, 167, 82, 193, 192,
-+ 82, 94, 4, 155, 195, 146, 10, 6, 78, 96,
-+ 222, 1, 103, 219, 50, 81, 195, 207, 76, 241,
-+ 112, 230, 68, 150, 201, 84, 48, 208, 159, 101,
-+ 25, 156, 205, 149, 76, 13, 39, 10, 240, 65,
-+ 25, 11, 54, 120, 10, 18, 171, 137, 17, 78,
-+ 96, 130, 173, 220, 252, 43, 193, 140, 133, 113,
-+ 237, 28, 32, 101, 64, 64, 145, 129, 12, 12,
-+ 142, 58, 149, 27, 65, 180, 97, 163, 16, 84,
-+ 25, 65, 19, 241, 27, 8, 4, 75, 64, 68,
-+ 110, 172, 30, 220, 64, 176, 51, 17, 8, 76,
-+ 65, 25, 112, 63, 48, 194, 20, 97, 49, 122,
-+ 209, 108, 32, 177, 88, 209, 30, 102, 32, 212,
-+ 84, 168, 129, 16, 2, 137, 135, 112, 33, 92,
-+ 4, 13, 212, 167, 130, 72, 17, 109, 152, 189,
-+ 48, 3, 161, 16, 46, 132, 144, 35, 96, 96,
-+ 153, 9, 136, 180, 211, 71, 87, 11, 119, 24,
-+ 3, 134, 57, 248, 13, 172, 50, 5, 145, 233,
-+ 10, 240, 240, 96, 100, 100, 68, 210, 11, 115,
-+ 24, 52, 104, 81, 194, 16, 123, 228, 116, 197,
-+ 128, 200, 114, 97, 130, 233, 5, 103, 148, 163,
-+ 129, 222, 80, 16, 57, 221, 138, 90, 230, 49,
-+ 172, 206, 2, 83, 53, 100, 185, 16, 27, 88,
-+ 227, 6, 166, 230, 64, 67, 134, 17, 150, 228,
-+ 144, 248, 48, 247, 48, 34, 83, 56, 193, 52,
-+ 31, 48, 181, 137, 1, 158, 118, 145, 12, 68,
-+ 209, 79, 68, 190, 4, 129, 149, 57, 168, 78,
-+ 64, 55, 16, 97, 14, 146, 11, 225, 110, 71,
-+ 214, 2, 149, 223, 236, 65, 158, 129, 12, 8,
-+ 67, 144, 19, 20, 3, 195, 246, 60, 178, 12,
-+ 100, 192, 105, 224, 230, 2, 36, 3, 209, 35,
-+ 133, 120, 3, 17, 202, 150, 235, 46, 69, 15,
-+ 117, 202, 92, 184, 202, 6, 191, 129, 24, 177,
-+ 140, 97, 32, 35, 170, 129, 12, 106, 29, 152,
-+ 6, 50, 50, 162, 196, 37, 138, 48, 186, 79,
-+ 81, 5, 25, 24, 214, 215, 17, 149, 186, 200,
-+ 0, 0, 218, 35, 72, 230, 144, 1, 81, 42,
-+ 0, 0, 0, 0, 73, 69, 78, 68, 174, 66,
-+ 96, 130 };
-diff -urN php-4.2.1RC2.org/main/php_logos.c php-4.2.1RC2/main/php_logos.c
---- php-4.2.1RC2.org/main/php_logos.c Sat May 11 20:49:24 2002
-+++ php-4.2.1RC2/main/php_logos.c Sat May 11 20:51:05 2002
-@@ -56,6 +56,7 @@
- php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo));
- php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
- php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo));
-+ php_register_info_logo(PLD_LOGO_GUID , "image/png", pld_logo , sizeof(pld_logo));
-
- return SUCCESS;
- }
+++ /dev/null
---- php-4.1.1/sapi/apache/sapi_apache.c Sat Aug 4 21:42:45 2001
-+++ ../php-4.1.1-changed/php-4.1.1/sapi/apache/sapi_apache.c Thu Jan 24
-12:08:40 2002
-@@ -89,13 +89,13 @@
-
- (void) php_execute_script(&file_handle TSRMLS_CC);
- }
--
-+/*
- AP(in_request) = 0;
-
- zend_try {
- php_request_shutdown(NULL);
- } zend_end_try();
--
-+*/
- return (OK);
- }
- /* }}} */
+++ /dev/null
---- php-4.3.0/ext/session/php_session.h.orig Thu Oct 3 08:45:15 2002
-+++ php-4.3.0/ext/session/php_session.h Tue Jan 7 12:45:39 2003
-@@ -181,6 +181,7 @@
- int php_get_session_var(char *name, size_t namelen, zval ***state_var TSRMLS_DC);
-
- PHPAPI int php_session_register_module(ps_module *);
-+PHPAPI int php_session_unregister_module(const char *name);
-
- PHPAPI int php_session_register_serializer(const char *name,
- int (*encode)(PS_SERIALIZER_ENCODE_ARGS),
---- php-4.3.0/ext/session/session.c.orig Thu Dec 5 21:42:05 2002
-+++ php-4.3.0/ext/session/session.c Tue Jan 7 12:45:38 2003
-@@ -208,12 +208,33 @@
- ps_modules[i] = ptr;
- ret = 0;
- break;
-- }
-+ } else if((ps_modules[i]->name != NULL) && (ptr->name != NULL) &&
-+ !strcasecmp(ps_modules[i]->name, ptr->name)) {
-+ /* avoid double registration */
-+ ret = 0;
-+ break;
-+ }
- }
-
- return ret;
- }
-
-+PHPAPI int php_session_unregister_module(const char *name)
-+{
-+ int ret = -1;
-+ int i;
-+
-+ for (i = 0; i < MAX_MODULES; i++) {
-+ if (ps_modules[i] && ps_modules[i]->name && !strcasecmp(ps_modules[i]->name, name)) {
-+ ps_modules[i] = 0;
-+ ret = 0;
-+ break;
-+ }
-+ }
-+
-+ return ret;
-+}
-+
- PHP_MINIT_FUNCTION(session);
- PHP_RINIT_FUNCTION(session);
- PHP_MSHUTDOWN_FUNCTION(session);
---- php-4.3.0/ext/session/mod_mm.c.orig Thu Dec 5 21:42:05 2002
-+++ php-4.3.0/ext/session/mod_mm.c Tue Jan 7 12:46:21 2003
-@@ -291,6 +291,7 @@
-
- PHP_MSHUTDOWN_FUNCTION(ps_mm)
- {
-+ php_session_unregister_module("mm");
- if (ps_mm_instance) {
- ps_mm_destroy(ps_mm_instance);
- return SUCCESS;
---- php-4.3.0/ext/msession/msession.c.orig Thu Aug 22 15:29:50 2002
-+++ php-4.3.0/ext/msession/msession.c Tue Jan 7 12:46:50 2003
-@@ -188,6 +188,9 @@
-
- PHP_MSHUTDOWN_FUNCTION(msession)
- {
-+#ifdef HAVE_PHP_SESSION
-+ php_session_unregister_module("msession");
-+#endif
- return SUCCESS;
- }
-
+++ /dev/null
---- php-4.3.0/Makefile.global.orig Tue Nov 12 18:40:38 2002
-+++ php-4.3.0/Makefile.global Thu Jan 2 23:29:35 2003
-@@ -10,8 +10,11 @@
-
- build-modules: $(PHP_MODULES)
-
--libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-+libphp_common.la: $(PHP_GLOBAL_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
-+
-+libphp4.la: libphp_common.la $(PHP_SAPI_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-
- libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
- $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so
-@@ -20,8 +23,17 @@
-
- install-sapi: libphp4.la
- @echo "Installing PHP SAPI module"
-+ -@$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la >/dev/null 2>&1
- -@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
- -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-+ -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); then \
-+ for i in 0.0.0 0.0 0; do \
-+ if test -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i; then \
-+ $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); \
-+ break; \
-+ fi; \
-+ done; \
-+ fi
- -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
- for i in 0.0.0 0.0 0; do \
- if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
---- php-4.3.0/sapi/cgi/Makefile.frag.orig Sun Sep 29 18:22:48 2002
-+++ php-4.3.0/sapi/cgi/Makefile.frag Thu Jan 2 23:33:29 2003
-@@ -1,2 +1,2 @@
--$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-+$(SAPI_CGI_PATH): libphp_common.la $(PHP_SAPI_OBJS)
- $(BUILD_CGI)
---- php-4.3.0/sapi/cli/Makefile.frag.orig Sun Sep 29 18:22:48 2002
-+++ php-4.3.0/sapi/cli/Makefile.frag Thu Jan 2 23:35:16 2003
-@@ -1,4 +1,4 @@
--$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS)
-+$(SAPI_CLI_PATH): libphp_common.la $(PHP_CLI_OBJS)
- $(BUILD_CLI)
-
- install-cli: $(SAPI_CLI_PATH)
---- php-4.3.0/sapi/cgi/config9.m4.orig Thu Dec 19 17:55:57 2002
-+++ php-4.3.0/sapi/cgi/config9.m4 Fri Jan 3 11:19:24 2003
-@@ -155,7 +155,7 @@
- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
- ;;
- *)
-- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
-+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
- ;;
- esac
-
---- php-4.3.0/sapi/cli/config.m4.orig Fri Dec 20 11:04:55 2002
-+++ php-4.3.0/sapi/cli/config.m4 Fri Jan 3 11:20:42 2003
-@@ -24,10 +24,10 @@
- ;;
- *cygwin*)
- SAPI_CLI_PATH=sapi/cli/php.exe
-- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
-+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
- ;;
- *)
-- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
-+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
- ;;
- esac
- INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/php"
+++ /dev/null
---- php-4.3.1/TSRM/threads.m4.orig Wed Feb 19 15:57:09 2003
-+++ php-4.3.1/TSRM/threads.m4 Wed Feb 19 15:57:42 2003
-@@ -108,7 +108,6 @@
- else
- save_CFLAGS=$CFLAGS
- save_LIBS=$LIBS
-- PTHREADS_ASSIGN_VARS
- PTHREADS_CHECK_COMPILE
- LIBS=$save_LIBS
- CFLAGS=$save_CFLAGS
-@@ -126,9 +125,10 @@
- break
- fi
- done
-+ pthreads_working=
- fi
--fi
- ])
-+fi
-
- AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
- ac_cv_pthreads_lib=
-@@ -155,6 +155,7 @@
- dnl
- dnl
- AC_DEFUN(PTHREADS_ASSIGN_VARS,[
-+if test "$pthreads_assign_done" != "yes" ; then
- if test -n "$ac_cv_pthreads_lib"; then
- LIBS="$LIBS -l$ac_cv_pthreads_lib"
- fi
-@@ -163,4 +164,6 @@
- if test -n "$ac_cv_pthreads_cflags"; then
- CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
- fi
-+pthreads_assign_done="yes"
-+fi
- ])dnl
+++ /dev/null
-include $(top_builddir)/config_vars.mk
-LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X)
-LTLIBRARY_SHARED_OBJECTS = $(LTLIBRARY_OBJECTS:.lo=.slo)
-$(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
- $(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
-$(LTLIBRARY_SHARED_NAME): $(LTLIBRARY_SHARED_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
- $(SHARED_LIBTOOL) --mode=link $(COMPILE) $(LDFLAGS) -o $@ -avoid-version -module -rpath $(phplibdir) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_SHARED_LIBADD)
- $(SHARED_LIBTOOL) --mode=install cp $@ $(phplibdir)
-
-targets = $(LTLIBRARY_NAME) $(LTLIBRARY_SHARED_NAME)
-
projects / packages / php.git / commitdiff