7 files changed, 61 insertions, 17 deletions

diff --git a/COPYING b/COPYING
index 06cc949..46d3f30 100644
--- a/COPYING
+++ b/COPYING
@@ -1,2 +1,2 @@
-Copyright (c) 2005-2007 Klever Group (http://www.klever.net/)
+Copyright (c) 2005-2008 Klever Group (http://www.klever.net/)
 
diff --git a/NEWS.xml b/NEWS.xml
index b20576f..160b197 100644
--- a/NEWS.xml
+++ b/NEWS.xml
@@ -2,2 +2,10 @@
 <news>
+ <version version="2.0.1" date="November 22nd, 2008">
+  <ni>Compile-time fixes and improvements</ni>
+  <ni>Portability improvements for FreeBSD</ni>
+  <ni>Really suppress debugging message from htmltidy when --disable-debug is in
+  effect</ni>
+  <ni>minor bugfixes</ni>
+  <ni>thread-safety improvements</ni>
+ </version>
  <version version="2.0" date="June 26th, 2008">
diff --git a/configure.ac b/configure.ac
index 3484146..a7b56ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,2 +1,2 @@
-AC_INIT([libopkele], [2.0], [libopkele-bugs@klever.net])
+AC_INIT([libopkele], [2.0.1], [libopkele-bugs@klever.net])
 AC_CONFIG_SRCDIR([include/opkele/opkele-config.h])
diff --git a/include/opkele/expat.h b/include/opkele/expat.h
index 3ab1630..21be003 100644
--- a/include/opkele/expat.h
+++ b/include/opkele/expat.h
@@ -28,2 +28,5 @@ namespace opkele {
 
+                virtual int unknown_encoding(const XML_Char * /* n */,XML_Encoding * /* i */) { return XML_STATUS_ERROR; }
+                void set_unknown_encoding_handler();
+
                 virtual void start_element(const XML_Char * /* n */,const XML_Char ** /* a */) { }
diff --git a/lib/basic_rp.cc b/lib/basic_rp.cc
index 3357d0b..3cad71c 100644
--- a/lib/basic_rp.cc
+++ b/lib/basic_rp.cc
@@ -1 +1,2 @@
+#include <sys/types.h>
 #include <cassert>
diff --git a/lib/discovery.cc b/lib/discovery.cc
index bd1f917..26f3eed 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -285,2 +285,3 @@ namespace opkele {
                 set_character_data_handler();
+                set_unknown_encoding_handler();
 
@@ -455,21 +456,36 @@ namespace opkele {
                 if(is_qelement(n,NSURI_XRD "\tType")) {
-                    assert(xrd); assert(xrd_service); assert(cdata==&cdata_buf);
-                    xrd_service->types.insert(cdata_buf);
+                    if(xrd && xrd_service) {
+                        assert(cdata==&cdata_buf);
+                        xrd_service->types.insert(cdata_buf);
+                    }
                 }else if(is_qelement(n,NSURI_XRD "\tService")) {
-                    assert(xrd); assert(xrd_service);
-                    assert(!pt_stack.empty());
-                    assert(pt_stack.back()==(NSURI_XRD "\tService"));
-                    pt_stack.pop_back();
-                    xrd_service = 0;
-                }else if(is_qelement(n,NSURI_XRD "\tStatus")) {
-                    assert(xrd);
-                    if(is_qelement(pt_stack.back().c_str(),n)) {
-                        assert(cdata==&status_string);
+                    if(!(xrd && xrd_service)) {
+                        skipping = -1;
+                    }else{
+                        assert(!pt_stack.empty());
+                        assert(pt_stack.back()==(NSURI_XRD "\tService"));
                         pt_stack.pop_back();
-                        if(status_code!=100)
-                            skipping = -1;
+                        xrd_service = 0;
+                    }
+                }else if(is_qelement(n,NSURI_XRD "\tStatus")) {
+                    if(!xrd) {
+                        skipping=-1;
+                    }else{
+                        if(is_qelement(pt_stack.back().c_str(),n)) {
+                            assert(cdata==&status_string);
+                            pt_stack.pop_back();
+                            if(status_code!=100)
+                                skipping = -1;
+                        }
                     }
                 }else if(is_qelement(n,NSURI_XRD "\tExpires")) {
-                    assert(xrd);
-                    xrd->expires = util::w3c_to_time(cdata_buf);
+                    if(!xrd) {
+                        skipping=-1;
+                    }else{
+                        xrd->expires = util::w3c_to_time(cdata_buf);
+                    }
+                }else if(is_qelement(n,NSURI_XRD "\tXRD")) {
+                    assert(!pt_stack.empty());
+                    assert(pt_stack.back()==(NSURI_XRD "\tXRD"));
+                    pt_stack.pop_back();
                 }else if((xmode&xmode_html) && is_element(n,"head")) {
@@ -571,2 +587,9 @@ namespace opkele {
 
+            int unknown_encoding(const XML_Char *n,XML_Encoding *i) {
+                for(int ii=0;ii < sizeof(i->map)/sizeof(i->map[0]);++ii)
+                    i->map[ii] = ii;
+                i->convert = 0; i->release = 0;
+                return XML_STATUS_OK;
+            }
+
     };
diff --git a/lib/expat.cc b/lib/expat.cc
index c4dab7e..fb58a9a 100644
--- a/lib/expat.cc
+++ b/lib/expat.cc
@@ -94,2 +94,11 @@ namespace opkele {
 
+        static int _unknown_encoding(void *ehd,const XML_Char *n,XML_Encoding *i) {
+            return ((expat_t*)ehd)->unknown_encoding(n,i);
+        }
+
+        void expat_t::set_unknown_encoding_handler() {
+            assert(_x);
+            XML_SetUnknownEncodingHandler(_x,_unknown_encoding,this);
+        }
+
     }