*** HTMLparser.c	Thu Mar 27 16:21:27 2003
--- ../XML/HTMLparser.c	Mon Apr  7 07:46:10 2003
***************
*** 5190,5202 ****
  htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void *user_data, 
                           const char *chunk, int size, const char *filename,
  			 xmlCharEncoding enc) {
      htmlParserCtxtPtr ctxt;
      htmlParserInputPtr inputStream;
      xmlParserInputBufferPtr buf;
  
      xmlInitParser();
  
!     buf = xmlAllocParserInputBuffer(enc);
      if (buf == NULL) return(NULL);
  
      ctxt = (htmlParserCtxtPtr) xmlMalloc(sizeof(htmlParserCtxt));
--- 5190,5210 ----
  htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void *user_data, 
                           const char *chunk, int size, const char *filename,
  			 xmlCharEncoding enc) {
+   return htmlCreatePushParserCtxt2(sax, user_data, chunk, size, filename,
+                                    xmlGetCharEncodingName(enc));
+ }
+ 
+ htmlParserCtxtPtr
+ htmlCreatePushParserCtxt2(htmlSAXHandlerPtr sax, void *user_data, 
+                           const char *chunk, int size, const char *filename,
+ 			  const char *enc) {
      htmlParserCtxtPtr ctxt;
      htmlParserInputPtr inputStream;
      xmlParserInputBufferPtr buf;
  
      xmlInitParser();
  
!     buf = xmlAllocParserInputBuffer2(enc);
      if (buf == NULL) return(NULL);
  
      ctxt = (htmlParserCtxtPtr) xmlMalloc(sizeof(htmlParserCtxt));
***************
*** 5206,5212 ****
      }
      memset(ctxt, 0, sizeof(htmlParserCtxt));
      htmlInitParserCtxt(ctxt);
!     if(enc==XML_CHAR_ENCODING_UTF8 || buf->encoder)
  	ctxt->charset=XML_CHAR_ENCODING_UTF8;
      if (sax != NULL) {
  	if (ctxt->sax != &htmlDefaultSAXHandler)
--- 5214,5220 ----
      }
      memset(ctxt, 0, sizeof(htmlParserCtxt));
      htmlInitParserCtxt(ctxt);
!     if(xmlParseCharEncoding(enc)==XML_CHAR_ENCODING_UTF8 || buf->encoder)
  	ctxt->charset=XML_CHAR_ENCODING_UTF8;
      if (sax != NULL) {
  	if (ctxt->sax != &htmlDefaultSAXHandler)