summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--COPYING2
-rw-r--r--NEWS.xml8
-rw-r--r--configure.ac2
-rw-r--r--include/opkele/expat.h3
-rw-r--r--lib/basic_rp.cc1
-rw-r--r--lib/discovery.cc31
-rw-r--r--lib/expat.cc9
7 files changed, 50 insertions, 6 deletions
diff --git a/COPYING b/COPYING
index 06cc949..46d3f30 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2007 Klever Group (http://www.klever.net/)
+Copyright (c) 2005-2008 Klever Group (http://www.klever.net/)
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
diff --git a/NEWS.xml b/NEWS.xml
index b20576f..160b197 100644
--- a/NEWS.xml
+++ b/NEWS.xml
@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="us-ascii"?>
<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">
<ni>OpenID 2.0 support</ni>
<ni>Major rewrite of the whole thing</ni>
diff --git a/configure.ac b/configure.ac
index 3484146..a7b56ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-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])
AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h])
AM_INIT_AUTOMAKE([dist-bzip2])
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
@@ -26,6 +26,9 @@ namespace opkele {
return XML_Parse(_x,s,len,final);
}
+ 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 */) { }
virtual void end_element(const XML_Char * /* n */) { }
void set_element_handler();
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,3 +1,4 @@
+#include <sys/types.h>
#include <cassert>
#include <openssl/sha.h>
#include <openssl/hmac.h>
diff --git a/lib/discovery.cc b/lib/discovery.cc
index bd1f917..26f3eed 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -283,6 +283,7 @@ namespace opkele {
(*(expat_t*)this) = parser_create_ns();
set_user_data(); set_element_handler();
set_character_data_handler();
+ set_unknown_encoding_handler();
if(xmode&xmode_html) {
html_openid1.clear(); html_openid2.clear();
@@ -453,25 +454,40 @@ namespace opkele {
--skipping; return;
}
if(is_qelement(n,NSURI_XRD "\tType")) {
- assert(xrd); assert(xrd_service); assert(cdata==&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);
+ if(!(xrd && xrd_service)) {
+ skipping = -1;
+ }else{
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(!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);
+ 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")) {
skipping = -1;
}
@@ -569,6 +585,13 @@ 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;
+ }
+
};
string idiscover(endpoint_discovery_iterator oi,const string& identity) {
diff --git a/lib/expat.cc b/lib/expat.cc
index c4dab7e..fb58a9a 100644
--- a/lib/expat.cc
+++ b/lib/expat.cc
@@ -92,6 +92,15 @@ namespace opkele {
XML_SetNamespaceDeclHandler(_x,_start_namespace_decl,_end_namespace_decl);
}
+ 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);
+ }
+
}
}