packages: ruby-mongrel/ruby-mongrel-ruby1.9.patch (NEW) - fix build with ru...

[baggins]

Author: baggins                      Date: Tue Mar  2 11:24:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build with ruby 1.9

---- Files affected:
packages/ruby-mongrel:
   ruby-mongrel-ruby1.9.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ruby-mongrel/ruby-mongrel-ruby1.9.patch
diff -u /dev/null packages/ruby-mongrel/ruby-mongrel-ruby1.9.patch:1.1
--- /dev/null	Tue Mar  2 12:24:06 2010
+++ packages/ruby-mongrel/ruby-mongrel-ruby1.9.patch	Tue Mar  2 12:24:01 2010
@@ -0,0 +1,39 @@
+--- ruby-mongrel-1.1.5-r19/ext/http11/http11.c.orig	2010-03-02 12:13:11.000000000 +0100
++++ ruby-mongrel-1.1.5-r19/ext/http11/http11.c	2010-03-02 12:17:49.425186754 +0100
+@@ -74,7 +74,7 @@
+   f = rb_str_dup(global_http_prefix);
+   f = rb_str_buf_cat(f, field, flen); 
+ 
+-  for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) {
++  for(ch = RSTRING_PTR(f), end = ch + RSTRING_LEN(f); ch < end; ch++) {
+     if(*ch == '-') {
+       *ch = '_';
+     } else {
+@@ -169,12 +169,12 @@
+   rb_hash_aset(req, global_gateway_interface, global_gateway_interface_value);
+   if((temp = rb_hash_aref(req, global_http_host)) != Qnil) {
+     /* ruby better close strings off with a '\0' dammit */
+-    colon = strchr(RSTRING(temp)->ptr, ':');
++    colon = strchr(RSTRING_PTR(temp), ':');
+     if(colon != NULL) {
+-      rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr));
++      rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING_PTR(temp)));
+       rb_hash_aset(req, global_server_port, 
+-          rb_str_substr(temp, colon - RSTRING(temp)->ptr+1, 
+-            RSTRING(temp)->len));
++          rb_str_substr(temp, colon - RSTRING_PTR(temp)+1, 
++            RSTRING_LEN(temp)));
+     } else {
+       rb_hash_aset(req, global_server_name, temp);
+       rb_hash_aset(req, global_server_port, global_port_80);
+@@ -295,8 +295,8 @@
+   DATA_GET(self, http_parser, http);
+ 
+   from = FIX2INT(start);
+-  dptr = RSTRING(data)->ptr;
+-  dlen = RSTRING(data)->len;
++  dptr = RSTRING_PTR(data);
++  dlen = RSTRING_LEN(data);
+ 
+   if(from >= dlen) {
+     rb_raise(eHttpParserError, "Requested start is after data buffer end.");
================================================================