Index: Rakefile =================================================================== --- Rakefile (revision 888) +++ Rakefile (working copy) @@ -1,4 +1,4 @@ - +PLATFORM = RUBY_PLATFORM if !defined?(PLATFORM) require 'rubygems' gem 'echoe', '>=2.7' require 'echoe' Index: ext/http11/http11.c =================================================================== --- ext/http11/http11.c (revision 888) +++ ext/http11/http11.c (working copy) @@ -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."); Index: ext/http11/ext_help.h =================================================================== --- ext/http11/ext_help.h (revision 888) +++ ext/http11/ext_help.h (working copy) @@ -11,4 +11,13 @@ #define TRACE() #endif +/* ruby 1.9 compat */ +#ifndef RSTRING_PTR +#define RSTRING_PTR(str) RSTRING(str)->ptr +#endif + +#ifndef RSTRING_LEN +#define RSTRING_LEN(str) RSTRING(str)->len +#endif + #endif