Changeset 895

Timestamp:

12/11/07 18:14:17 (9 months ago)

Author:

filipe

Message:

Added compatibility for ruby1.9. Changes made:
* changed RSTRING(temp)->ptr to STRING_PTR(temp) (new macro available since ruby 1.8.6)
* changed RSTRING(data)->len to RSTRING_LEN(data) (new macro available since ruby 1.8.6)
* added ifndef conditions to check if macros STRING_PTR and STRING_LEN. If do not defined, create them.

Files:

• trunk/ext/http11/http11.c (modified) (4 diffs)

trunk/ext/http11/http11.c

@@ -9 +9 @@
-#include "http11_parser.h"
-#include <ctype.h>
+
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
-
-static VALUE mMongrel;
@@ -75 +82 @@
-  f = rb_str_buf_cat(f, field, flen); 
-
-(f)->ptr, end = ch + RSTRING(f)->len
+_PTR(f), end = ch + RSTRING_LEN(f)
-    if(*ch == '-') {
-      *ch = '_';
@@ -170 +177 @@
-  if((temp = rb_hash_aref(req, global_http_host)) != Qnil) {
-    /* ruby better close strings off with a '\0' dammit */
-(temp)->ptr
+_PTR(temp)
-    if(colon != NULL) {
-(temp)->ptr
+_PTR(temp)
-      rb_hash_aset(req, global_server_port, 
-(temp)->ptr
-(temp)->len
+_PTR(temp)
+_LEN(temp)
-    } else {
-      rb_hash_aset(req, global_server_name, temp);
@@ -296 +303 @@
-
-  from = FIX2INT(start);
-(data)->ptr
-(data)->len
+_PTR(data)
+_LEN(data)
-
-  if(from >= dlen) {