[PHP-DEV] CVS update: php3/functions From: ssb (php-dev <email protected>)
Date: 12/28/98

Date: Monday December 28, 1998 @ 11:08
Author: ssb

Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv25444

Modified Files:
        xml.c
Log Message:
don't set up handlers until a PHP script sets them

Index: php3/functions/xml.c
diff -c php3/functions/xml.c:1.16 php3/functions/xml.c:1.17
*** php3/functions/xml.c:1.16 Mon Dec 21 10:48:33 1998
--- php3/functions/xml.c Mon Dec 28 11:08:56 1998
***************
*** 27,33 ****
     +----------------------------------------------------------------------+
   */
  
! /* $Id: xml.c,v 1.16 1998/12/21 15:48:33 shane Exp $ */
  #define IS_EXT_MODULE
  #if COMPILE_DL
  # if PHP_31
--- 27,33 ----
     +----------------------------------------------------------------------+
   */
  
! /* $Id: xml.c,v 1.17 1998/12/28 16:08:56 ssb Exp $ */
  #define IS_EXT_MODULE
  #if COMPILE_DL
  # if PHP_31
***************
*** 859,871 ****
          parser->parser = XML_ParserCreate(encoding);
          parser->target_encoding = encoding;
          XML_SetUserData(parser->parser, parser);
- XML_SetElementHandler(parser->parser, php3i_xml_startElementHandler, php3i_xml_endElementHandler);
- XML_SetCharacterDataHandler(parser->parser, php3i_xml_characterDataHandler);
- XML_SetProcessingInstructionHandler(parser->parser, php3i_xml_processingInstructionHandler);
- XML_SetDefaultHandler(parser->parser, php3i_xml_defaultHandler);
- XML_SetUnparsedEntityDeclHandler(parser->parser, php3i_xml_unparsedEntityDeclHandler);
- XML_SetNotationDeclHandler(parser->parser, php3i_xml_notationDeclHandler);
- XML_SetExternalEntityRefHandler(parser->parser, php3i_xml_externalEntityRefHandler);
          id = php3_list_insert(parser, XML_GLOBAL(php3_xml_module).le_xml_parser);
          parser = xml_get_parser(id, thisfunc, list);
          parser->index = id;
--- 859,864 ----
***************
*** 896,901 ****
--- 889,895 ----
          }
          xml_set_handler(&parser->startElementHandler, shdl);
          xml_set_handler(&parser->endElementHandler, ehdl);
+ XML_SetElementHandler(parser->parser, php3i_xml_startElementHandler, php3i_xml_endElementHandler);
          RETVAL_TRUE;
  }
  
***************
*** 918,923 ****
--- 912,918 ----
                  RETURN_FALSE;
          }
          xml_set_handler(&parser->characterDataHandler, hdl);
+ XML_SetCharacterDataHandler(parser->parser, php3i_xml_characterDataHandler);
          RETVAL_TRUE;
  }
  
***************
*** 940,945 ****
--- 935,941 ----
                  RETURN_FALSE;
          }
          xml_set_handler(&parser->processingInstructionHandler, hdl);
+ XML_SetProcessingInstructionHandler(parser->parser, php3i_xml_processingInstructionHandler);
          RETVAL_TRUE;
  }
  
***************
*** 962,967 ****
--- 958,964 ----
                  RETURN_FALSE;
          }
          xml_set_handler(&parser->defaultHandler, hdl);
+ XML_SetDefaultHandler(parser->parser, php3i_xml_defaultHandler);
          RETVAL_TRUE;
  }
  
***************
*** 984,989 ****
--- 981,987 ----
                  RETURN_FALSE;
          }
          xml_set_handler(&parser->unparsedEntityDeclHandler, hdl);
+ XML_SetUnparsedEntityDeclHandler(parser->parser, php3i_xml_unparsedEntityDeclHandler);
          RETVAL_TRUE;
  }
  
***************
*** 1006,1011 ****
--- 1004,1010 ----
                  RETURN_FALSE;
          }
          xml_set_handler(&parser->notationDeclHandler, hdl);
+ XML_SetNotationDeclHandler(parser->parser, php3i_xml_notationDeclHandler);
          RETVAL_TRUE;
  }
  
***************
*** 1028,1033 ****
--- 1027,1033 ----
                  RETURN_FALSE;
          }
          xml_set_handler(&parser->externalEntityRefHandler, hdl);
+ XML_SetExternalEntityRefHandler(parser->parser, php3i_xml_externalEntityRefHandler);
          RETVAL_TRUE;
  }
   

--
PHP Development Mailing List   http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe <email protected>
For help: php-dev-help <email protected>