The patches: I attach my versions of two of the patches to 2.6.16
of libxml. The setglobalstate patch seems to be unnecessary if
you use their setglobalstate function - maybe you could look at
that? (I skipped that for the moment.)
Peter
-- Peter Svanberg <psv@xxxxxxxxxxx> skrev, den 17 mars 2005 kl
13.12 +0100:
Now I've build Apache 2.0.53 and mod_xslt2 referring to that
can be built OK!
One strange problem, though: When I do "make install" some
makefiles use a helper-sh script, but use options (i.e. -D and
also some long as --mode) which is not supported in that
script. How could that ever work...? (I changed by hand two
Makefiles to use "install" and had gnu-install in my PATH.)
I havn't tested anything yet...
Peter
-- Peter Svanberg <psv@xxxxxxxxxxx> skrev, den 14 mars 2005 kl
11.43 +0100:
> I can't find info on how the apache was built but we must
> probably anyhow use a later version of Apache for other
> purposes so I guess it's better that I build a new. Would you
> advise me to use gcc instead of cc then?
+ typedef struct xmlNanoHTTPCtxt {
+ char *protocol; /* the protocol name */
+ char *hostname; /* the host name */
+ int port; /* the port */
+ char *path; /* the path within the URL */
+ SOCKET fd; /* the file descriptor for the
socket */
+ int state; /* WRITE / READ / CLOSED */
+ char *out; /* buffer sent (zero terminated)
*/
+ char *outptr; /* index within the buffer sent */
+ char *in; /* the receiving buffer */
+ char *content; /* the start of the content */
+ char *inptr; /* the next byte to read from network */
+ char *inrptr; /* the next byte to give back to the
client */
+ int inlen; /* len of the input buffer */
+ int last; /* return code for last operation */
+ int returnValue; /* the protocol return value */
+ int ContentLength; /* specified content length from HTTP
header */
+ char *contentType; /* the MIME type for the input */
+ char *location; /* the new URL in case of redirect */
+ char *authHeader; /* contents of {WWW,Proxy}-Authenticate
header */
+ char *encoding; /* encoding extracted from the
contentType */
+ char *mimeType; /* Mime-Type extracted from the
contentType */
+ } xmlNanoHTTPCtxt, *xmlNanoHTTPCtxtPtr;
+
#ifdef __cplusplus
extern "C" {
#endif
*** nanohttp.c.ORIG Wed Oct 27 11:42:38 2004
--- nanohttp.c Mon Mar 7 14:11:50 2005
***************
*** 82,87 ****
--- 82,90 ----
#define SOCKLEN_T unsigned int
#endif
- typedef struct xmlNanoHTTPCtxt {
- char *protocol; /* the protocol name */
- char *hostname; /* the host name */
- int port; /* the port */
- char *path; /* the path within the URL */
- SOCKET fd; /* the file descriptor for the
socket */
- int state; /* WRITE / READ / CLOSED */
- char *out; /* buffer sent (zero terminated)
*/
- char *outptr; /* index within the buffer sent */
- char *in; /* the receiving buffer */
- char *content; /* the start of the content */
- char *inptr; /* the next byte to read from network */
- char *inrptr; /* the next byte to give back to the
client */
- int inlen; /* len of the input buffer */
- int last; /* return code for last operation */
- int returnValue; /* the protocol return value */
- int ContentLength; /* specified content length from HTTP
header */
- char *contentType; /* the MIME type for the input */
- char *location; /* the new URL in case of redirect */
- char *authHeader; /* contents of {WWW,Proxy}-Authenticate
header */
- char *encoding; /* encoding extracted from the
contentType */
- char *mimeType; /* Mime-Type extracted from the
contentType */
- } xmlNanoHTTPCtxt, *xmlNanoHTTPCtxtPtr;
-
static int initialized = 0;
static char *proxy = NULL; /* the proxy name if any */
static int proxyPort; /* the proxy port if any */
--- 129,134 ----
*** nanohttp.c.~3~ Mon Mar 7 14:11:50 2005
--- nanohttp.c Thu Mar 17 13:33:35 2005
***************
*** 1453,1458 ****
--- 1453,1467 ----
return(NULL);
}
+ if(ctxt->returnValue != 200) {
+ #ifdef DEBUG_HTTP
+ xmlGenericError(xmlGenericErrorContext,
+ "xmlNanoHTTPMethodRedir: Skipping document, since
status != 200 (%d)...\n", c
txt->returnValue);
+ #endif
+ xmlNanoHTTPFreeCtxt(ctxt);
+ return NULL;
+ }
+
if (contentType != NULL) {
if (ctxt->contentType != NULL)
*contentType = xmlMemStrdup(ctxt->contentType);
