clogger 0.0.2 → 0.0.3

data/GNUmakefile

@@ -44,10 +44,11 @@ release_changes := release_changes-$(VERSION).txt
 $(release_changes): verify
 	git diff --stat $(vPREV) v$(VERSION) > $@+
 	echo >> $@+
-	git log $(vPREV) v$(VERSION) >> $@+
+	git log $(vPREV)..v$(VERSION) >> $@+
 	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 $(release_notes): verify package
 	gem spec pkg/clogger-$(VERSION).gem description | sed -ne '/\w/p' > $@+
+	echo >> $@+
 	git cat-file tag v$(VERSION) | awk 'p>1{print $$0}/^$$/{++p}' >> $@+
 	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 verify:
@@ -65,11 +66,11 @@ package: verify
 
 # not using Hoe's release system since we release 2 gems but only one tgz
 release: package Manifest.txt $(release_notes) $(release_changes)
-	rubyforge add_release -f -n $(release_notes) -c $(release_changes) \
+	rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
 	  clogger clogger $(VERSION) pkg/clogger-$(VERSION).gem
 	rubyforge add_file \
 	  clogger clogger $(VERSION) pkg/clogger-$(VERSION).tgz
-	rubyforge add_release -f -n $(release_notes) -c $(release_changes) \
+	rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
 	  clogger clogger_ext $(VERSION) pkg/clogger_ext-$(VERSION).gem
 endif
 

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.0.3 / 2009-08-29
+
+    The MRI extension clogger_ext gets GC bug fix and
+    cleanups/robustness improvements.  It should now be more
+    tolerant of misbehaving applications in that it'll be less
+    likely to segfault.  No changes to the (recommended) pure
+    implementation.
+
 === 0.0.2 / 2009-08-29
 
 * 2 bug fixes

data/ext/clogger_ext/clogger.c

@@ -188,7 +188,7 @@ struct response_ops { long nr; VALUE ops; };
 static VALUE swap_sent_headers(VALUE kv, VALUE memo)
 {
 	struct response_ops *tmp = (struct response_ops *)memo;
-	VALUE key = RARRAY_PTR(kv)[0];
+	VALUE key = rb_obj_as_string(RARRAY_PTR(kv)[0]);
 	long i = RARRAY_LEN(tmp->ops);
 	VALUE *ary = RARRAY_PTR(tmp->ops);
 	VALUE value;
@@ -248,7 +248,13 @@ static void clogger_mark(void *ptr)
 {
 	struct clogger *c = ptr;
 
-	rb_gc_mark_locations(&c->app, &c->response);
+	rb_gc_mark(c->app);
+	rb_gc_mark(c->fmt_ops);
+	rb_gc_mark(c->logger);
+	rb_gc_mark(c->log_buf);
+	rb_gc_mark(c->env);
+	rb_gc_mark(c->cookies);
+	rb_gc_mark(c->response);
 }
 
 static VALUE clogger_alloc(VALUE klass)
@@ -331,10 +337,11 @@ static VALUE clogger_wrap_body(VALUE self)
 	return clogger_get(self)->wrap_body == 0 ? Qfalse : Qtrue;
 }
 
-static void append_status(struct clogger *c, VALUE status)
+static void append_status(struct clogger *c)
 {
 	char buf[sizeof("999")];
 	int nr;
+	VALUE status = RARRAY_PTR(c->response)[0];
 
 	if (TYPE(status) != T_FIXNUM) {
 		status = rb_funcall(status, to_i_id, 0);
@@ -536,7 +543,7 @@ static void special_var(struct clogger *c, enum clogger_special var)
 		append_body_bytes_sent(c);
 		break;
 	case CL_SP_status:
-		append_status(c, RARRAY_PTR(c->response)[0]);
+		append_status(c);
 		break;
 	case CL_SP_request:
 		append_request(c);
@@ -667,6 +674,7 @@ static VALUE body_iter_i(VALUE str, VALUE memop)
 {
 	off_t *len = (off_t *)memop;
 
+	str = rb_obj_as_string(str);
 	*len += RSTRING_LEN(str);
 
 	return rb_yield(str);
@@ -676,7 +684,6 @@ static VALUE wrap_each(struct clogger *c)
 {
 	VALUE body = RARRAY_PTR(c->response)[2];
 
-	rb_need_block();
 	c->body_bytes_sent = 0;
 	rb_iterate(rb_each, body, body_iter_i, (VALUE)&c->body_bytes_sent);
 
@@ -695,6 +702,8 @@ static VALUE clogger_each(VALUE self)
 {
 	struct clogger *c = clogger_get(self);
 
+	rb_need_block();
+
 	return rb_ensure(wrap_each, (VALUE)c, cwrite, (VALUE)c);
 }
 

data/lib/clogger.rb

@@ -1,6 +1,6 @@
 # -*- encoding: binary -*-
 class Clogger
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   OP_LITERAL = 0
   OP_REQUEST = 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: clogger
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Eric Wong