Author: joes
Date: Fri Sep 2 10:19:41 2005
New Revision: 267233
URL: http://svn.apache.org/viewcvs?rev=267233&view=rev
Log:
Fix compile errors on Cygwin.
Submitted by: Nikolay Ananiev
Reviewed by: joes
Also fix the utf8 comment so it's easier to see the new bits.
Modified:
httpd/apreq/trunk/CHANGES
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/APR__Request.h
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Cookie/APR__Request__Cookie.h
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Error/APR__Request__Error.h
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Param/APR__Request__Param.h
httpd/apreq/trunk/library/util.c
Modified: httpd/apreq/trunk/CHANGES
URL:
http://svn.apache.org/viewcvs/httpd/apreq/trunk/CHANGES?rev=267233&r1=267232&r2=267233&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Fri Sep 2 10:19:41 2005
@@ -5,6 +5,9 @@
@section v2_07 Changes with libapreq2-2.07
+- Perl XS [Nikolay Ananiev]
+ Use MP_STATIC declarations to allow Cygwin builds.
+
- Perl API [joes]
encode()/decode() were busted with zero-length args. This caused
Apache2::Cookie::new() to segfault on cookie value of "".
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/APR__Request.h
URL:
http://svn.apache.org/viewcvs/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/APR__Request.h?rev=267233&r1=267232&r2=267233&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/APR__Request.h (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/APR__Request.h Fri Sep 2
10:19:41 2005
@@ -1,6 +1,6 @@
#include "apreq_xs_tables.h"
-static XS(apreq_xs_jar)
+MP_STATIC XS(apreq_xs_jar)
{
dXSARGS;
apreq_handle_t *req;
@@ -79,7 +79,7 @@
}
-static XS(apreq_xs_args)
+MP_STATIC XS(apreq_xs_args)
{
dXSARGS;
apreq_handle_t *req;
@@ -159,7 +159,7 @@
}
}
-static XS(apreq_xs_body)
+MP_STATIC XS(apreq_xs_body)
{
dXSARGS;
apreq_handle_t *req;
@@ -240,7 +240,7 @@
}
-static XS(apreq_xs_param)
+MP_STATIC XS(apreq_xs_param)
{
dXSARGS;
apreq_handle_t *req;
@@ -317,7 +317,7 @@
}
-static XS(apreq_xs_parse)
+MP_STATIC XS(apreq_xs_parse)
{
dXSARGS;
apreq_handle_t *req;
Modified:
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Cookie/APR__Request__Cookie.h
URL:
http://svn.apache.org/viewcvs/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Cookie/APR__Request__Cookie.h?rev=267233&r1=267232&r2=267233&view=diff
==============================================================================
---
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Cookie/APR__Request__Cookie.h
(original)
+++
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Cookie/APR__Request__Cookie.h
Fri Sep 2 10:19:41 2005
@@ -42,7 +42,7 @@
return rv;
}
-static XS(apreq_xs_cookie_table_do)
+MP_STATIC XS(apreq_xs_cookie_table_do)
{
dXSARGS;
struct apreq_xs_do_arg d = { NULL, NULL, NULL, aTHX };
@@ -78,7 +78,7 @@
XSRETURN_IV(rv);
}
-static XS(apreq_xs_cookie_table_FETCH)
+MP_STATIC XS(apreq_xs_cookie_table_FETCH)
{
dXSARGS;
const apr_table_t *t;
@@ -140,7 +140,7 @@
XSRETURN(0);
}
-static XS(apreq_xs_cookie_table_NEXTKEY)
+MP_STATIC XS(apreq_xs_cookie_table_NEXTKEY)
{
dXSARGS;
SV *sv, *obj;
@@ -174,7 +174,7 @@
}
-static XS(XS_APR__Request__Cookie_nil)
+MP_STATIC XS(XS_APR__Request__Cookie_nil)
{
dXSARGS;
(void)items;
Modified:
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Error/APR__Request__Error.h
URL:
http://svn.apache.org/viewcvs/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Error/APR__Request__Error.h?rev=267233&r1=267232&r2=267233&view=diff
==============================================================================
---
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Error/APR__Request__Error.h
(original)
+++
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Error/APR__Request__Error.h
Fri Sep 2 10:19:41 2005
@@ -1,4 +1,4 @@
-static XS(XS_APR__Request__Error_nil)
+MP_STATIC XS(XS_APR__Request__Error_nil)
{
dXSARGS;
(void)items;
Modified:
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Param/APR__Request__Param.h
URL:
http://svn.apache.org/viewcvs/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Param/APR__Request__Param.h?rev=267233&r1=267232&r2=267233&view=diff
==============================================================================
---
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Param/APR__Request__Param.h
(original)
+++
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Param/APR__Request__Param.h
Fri Sep 2 10:19:41 2005
@@ -43,7 +43,7 @@
return rv;
}
-static XS(apreq_xs_param_table_do)
+MP_STATIC XS(apreq_xs_param_table_do)
{
dXSARGS;
struct apreq_xs_do_arg d = { NULL, NULL, NULL, aTHX };
@@ -79,7 +79,7 @@
XSRETURN_IV(rv);
}
-static XS(apreq_xs_param_table_FETCH)
+MP_STATIC XS(apreq_xs_param_table_FETCH)
{
dXSARGS;
const apr_table_t *t;
@@ -142,7 +142,7 @@
XSRETURN(0);
}
-static XS(apreq_xs_param_table_NEXTKEY)
+MP_STATIC XS(apreq_xs_param_table_NEXTKEY)
{
dXSARGS;
SV *sv, *obj;
@@ -176,7 +176,7 @@
}
-static XS(XS_APR__Request__Param_nil)
+MP_STATIC XS(XS_APR__Request__Param_nil)
{
dXSARGS;
(void)items;
@@ -209,7 +209,7 @@
/* XXX these Apache::Upload::Brigade funcs need a makeover as vanilla XS. */
-static XS(apreq_xs_brigade_copy)
+MP_STATIC XS(apreq_xs_brigade_copy)
{
dXSARGS;
apr_bucket_brigade *bb, *bb_copy;
@@ -234,7 +234,7 @@
XSRETURN(1);
}
-static XS(apreq_xs_brigade_read)
+MP_STATIC XS(apreq_xs_brigade_read)
{
dXSARGS;
apr_bucket_brigade *bb;
@@ -332,7 +332,7 @@
XSRETURN_IV(want);
}
-static XS(apreq_xs_brigade_readline)
+MP_STATIC XS(apreq_xs_brigade_readline)
{
dXSARGS;
apr_bucket_brigade *bb;
Modified: httpd/apreq/trunk/library/util.c
URL:
http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/util.c?rev=267233&r1=267232&r2=267233&view=diff
==============================================================================
--- httpd/apreq/trunk/library/util.c (original)
+++ httpd/apreq/trunk/library/util.c Fri Sep 2 10:19:41 2005
@@ -219,12 +219,12 @@
/**
* Valid utf8 bit patterns: (true utf8 must satisfy a minimality condition)
*
- * 0xxxxxxx
- * 110xxxxx 10xxxxxx minimality mask: 0x1E
- * 1110xxxx 10xxxxxx 10xxxxxx 0x0F || 0x20
- * 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx 0x07 || 0x30
- * 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 0x03 || 0x38
- * 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 0x01 || 0x3C
+ * 0aaaaaaa
+ * 110bbbba 10aaaaaa minimality mask: 0x1E
+ * 1110cccc 10cbbbba 10aaaaaa 0x0F || 0x20
+ * 11110ddd 10ddcccc 10cbbbba 10aaaaaa 0x07 || 0x30
+ * 111110ee 10eeeddd 10ddcccc 10cbbbba 10aaaaaa 0x03 || 0x38
+ * 1111110f 10ffffee 10eeeddd 10ddcccc 10cbbbba 10aaaaaa 0x01 || 0x3C
*
* Charset divination heuristics:
* 1) presume ascii; if not, then
