Skip to content

Fix encoding with libxml2 >= 2.12 push parser #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lenz1111 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix encoding with libxml2 >= 2.12 push parser #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

#include <libxml/HTMLparser.h>
#include <libxml/HTMLtree.h>
#include <libxml/parserInternals.h>

@interface NSObject(contentHandlerExtensions)

Expand Down Expand Up @@ -248,6 +249,15 @@ - (void)setupParserWithDocumentPath:(NSString *)_path {
0 /* chunklen */,
[_path cString] /* filename */,
charEncoding /* encoding */);

// The enc parameter of htmlCreatePushParserCtxt is deprecated and ignored
// in libxml2 >= 2.12. Use xmlSwitchEncoding() to explicitly set the
// encoding on the parser context. This is backward-compatible with older
// libxml2 versions where it is a harmless no-op.
if (self->ctxt && charEncoding != XML_CHAR_ENCODING_NONE) {
xmlSwitchEncoding((xmlParserCtxtPtr)self->ctxt, charEncoding);
}

self->doc = NULL;
}
- (void)tearDownParser {
Expand Down