evdispatch 0.1.5 → 0.2.0

data/ext/revdispatch/libdispatch-0.1/src/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,11 +15,15 @@
 @SET_MAKE@
 
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,22 +61,17 @@ libdispatch_la_LIBADD =
 am_libdispatch_la_OBJECTS = libdispatch_la-ev_dispatch.lo \
 	libdispatch_la-ev_http.lo
 libdispatch_la_OBJECTS = $(am_libdispatch_la_OBJECTS)
-libdispatch_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-	$(libdispatch_la_CXXFLAGS) $(CXXFLAGS) \
-	$(libdispatch_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp =
 am__depfiles_maybe =
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libdispatch_la_SOURCES)
 DIST_SOURCES = $(libdispatch_la_SOURCES)
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -81,6 +80,8 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -107,8 +108,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
-GREP = @GREP@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -121,8 +120,9 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -132,18 +132,20 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
-SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -155,39 +157,28 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
-htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
-psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 VERSION_INFO = 0:1
 include_HEADERS = ev_dispatch.h ev_http.h
@@ -230,7 +221,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -241,7 +232,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -256,7 +247,7 @@ clean-libLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libdispatch.la: $(libdispatch_la_OBJECTS) $(libdispatch_la_DEPENDENCIES) 
-	$(libdispatch_la_LINK) -rpath $(libdir) $(libdispatch_la_OBJECTS) $(libdispatch_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libdispatch_la_LDFLAGS) $(libdispatch_la_OBJECTS) $(libdispatch_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -274,19 +265,23 @@ distclean-compile:
 	$(LTCXXCOMPILE) -c -o $@ $<
 
 libdispatch_la-ev_dispatch.lo: ev_dispatch.cc
-	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdispatch_la_CXXFLAGS) $(CXXFLAGS) -c -o libdispatch_la-ev_dispatch.lo `test -f 'ev_dispatch.cc' || echo '$(srcdir)/'`ev_dispatch.cc
+	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdispatch_la_CXXFLAGS) $(CXXFLAGS) -c -o libdispatch_la-ev_dispatch.lo `test -f 'ev_dispatch.cc' || echo '$(srcdir)/'`ev_dispatch.cc
 
 libdispatch_la-ev_http.lo: ev_http.cc
-	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdispatch_la_CXXFLAGS) $(CXXFLAGS) -c -o libdispatch_la-ev_http.lo `test -f 'ev_http.cc' || echo '$(srcdir)/'`ev_http.cc
+	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdispatch_la_CXXFLAGS) $(CXXFLAGS) -c -o libdispatch_la-ev_http.lo `test -f 'ev_http.cc' || echo '$(srcdir)/'`ev_http.cc
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -351,21 +346,22 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -381,7 +377,7 @@ check: check-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -415,7 +411,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 distclean: distclean-am
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -429,20 +425,12 @@ info-am:
 
 install-data-am: install-includeHEADERS
 
-install-dvi: install-dvi-am
-
 install-exec-am: install-libLTLIBRARIES
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -462,23 +450,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+	uninstall-libLTLIBRARIES
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-includeHEADERS install-info \
-	install-info-am install-libLTLIBRARIES install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-includeHEADERS \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-includeHEADERS install-info \
+	install-info-am install-libLTLIBRARIES install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-includeHEADERS uninstall-info-am \
 	uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

data/ext/revdispatch/libdispatch-0.1/src/ev_dispatch.cc

@@ -23,6 +23,41 @@
 
 namespace EVD {
 
+double Timer::elapsed_time( struct timeval *y )
+{
+  struct timeval duration;
+  struct timeval now;
+  current_time( &now );
+  struct timeval *x = &now;
+  struct timeval *result = &duration;
+
+  // see: http://www.gnu.org/software/libtool/manual/libc/Elapsed-Time.html
+  // Perform the carry for the later subtraction by updating y.
+  if (x->tv_usec < y->tv_usec) {
+    int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1;
+    y->tv_usec -= 1000000 * nsec;
+    y->tv_sec += nsec;
+  }
+
+  if (x->tv_usec - y->tv_usec > 1000000) {
+    int nsec = (x->tv_usec - y->tv_usec) / 1000000;
+    y->tv_usec += 1000000 * nsec;
+    y->tv_sec -= nsec;
+  }
+
+  // Compute the time remaining to wait.
+  // tv_usec is certainly positive.
+  result->tv_sec = x->tv_sec - y->tv_sec;
+  result->tv_usec = x->tv_usec - y->tv_usec;
+
+  double elasped = ((double)duration.tv_sec + ((double)duration.tv_usec/1000000.0));
+  // Return 1 if result is negative.
+  if( x->tv_sec < y->tv_sec ){
+    return (-1.0 * elasped);
+  }
+  return elasped;
+}
+
 Dispatch::Dispatch() : m_loop(NULL), m_counter(0), m_loop_started(false), m_http_client(NULL), m_pending(0)
 {
   // zero everything out

data/ext/revdispatch/libdispatch-0.1/src/ev_dispatch.h

@@ -16,13 +16,25 @@ namespace EVD {
   // unique id to represent a request
   typedef unsigned long request_t;
 
+  struct Timer {
+    Timer( long int seconds, long int nanoseconds ) {
+      struct timeval now;
+      current_time( &now );
+      m_time.tv_sec = now.tv_sec + seconds;
+      m_time.tv_nsec = (now.tv_usec * 1000) + nanoseconds;
+    }
+    inline static int current_time( struct timeval *now) { return gettimeofday(now, NULL); }
+    static double elapsed_time( struct timeval *then );
+    struct timespec m_time;
+  };
+
   struct Request {
     enum Type{
       HTTP,
       SPHINX,
       MEMCACHED
     };
-    Request( request_t k, const std::string &u ) : key(k), url(u){ time( &start_time); }
+    Request( request_t k, const std::string &u ) : key(k), url(u){ Timer::current_time( &start_time); }
     virtual ~Request (){ }
 
     // by default this does nothing, each real request object can do as it pleases with this feature
@@ -36,18 +48,12 @@ namespace EVD {
     // key will be set by the dispatch object when you invoke this request
     request_t key;
     std::string url;
-    time_t start_time;
+    struct timeval start_time;
   };
 
-  // TODO:
-  //struct MemcachedRequesst : public Request {
-  //};
-
-  // TODO:
-  //struct SphinxRequest : public Request {
-  //};
-
   struct Response {
+    Response(){}
+    Response( const std::string &n ) : name(n){}
     virtual ~Response(){}
     std::string name;
     std::string body;
@@ -72,16 +78,6 @@ namespace EVD {
     pthread_mutex_t m_lock;
   };
 
-  struct Timer {
-    Timer( long int seconds, long int nanoseconds ){
-      struct timeval now;
-      gettimeofday(&now, NULL);
-      m_time.tv_sec = now.tv_sec + seconds;
-      m_time.tv_nsec = (now.tv_usec * 1000) + nanoseconds;
-    }
-    struct timespec m_time;
-  };
-
   struct Cond {
     Cond() {
       pthread_cond_init( &m_cond, NULL );

data/ext/revdispatch/libdispatch-0.1/src/ev_http.cc

@@ -170,14 +170,19 @@ size_t HttpRequest::write_cb(void *ptr, size_t size, size_t nmemb, void *data)
   size_t realsize = size * nmemb;
   HttpRequest *req = (HttpRequest *)data;
 
-  if( req->response ) {
-    req->response->body.append((const char*)ptr,realsize);
-    //fprintf(stderr, "Write: %s (%lu) => (%d)%s\n", req->url.c_str(), realsize, (int)req->response, req->response->body.c_str() );
-  }
-  else if( req->m_fd ) {
-    write( req->m_fd, ptr, realsize );
-  }
+  req->m_response->write( ptr, realsize, size, nmemb );
+
+  return realsize;
+}
 
+// CURLOPT_HEADERFUNCTION
+size_t HttpRequest::header_write_cb(void *ptr, size_t size, size_t nmemb, void *data)
+{
+  size_t realsize = size * nmemb;
+  HttpRequest *req = (HttpRequest *)data;
+  
+  req->m_response->write_header( ptr, realsize, size, nmemb );
+  
   return realsize;
 }
 
@@ -189,35 +194,45 @@ int HttpRequest::prog_cb(void *p, double dltotal, double dlnow, double ult, doub
   return 0;
 }
 
-HttpRequest::HttpRequest( Dispatch &dispatch, const std::string &url )
-  : Request( 0, url ), response(new Response()), m_handle(curl_easy_init()), m_client(dispatch.getHttpClient())
+void HttpRequest::init_curl()
 {
-  memset(error,'\0', CURL_ERROR_SIZE);
   curl_easy_setopt(m_handle, CURLOPT_URL, url.c_str());
+  curl_easy_setopt(m_handle, CURLOPT_HEADERFUNCTION, header_write_cb);
+  curl_easy_setopt(m_handle, CURLOPT_HEADERDATA, this);
   curl_easy_setopt(m_handle, CURLOPT_WRITEFUNCTION, write_cb);
   curl_easy_setopt(m_handle, CURLOPT_WRITEDATA, this);
   curl_easy_setopt(m_handle, CURLOPT_VERBOSE, 0);
-  curl_easy_setopt(m_handle, CURLOPT_ERRORBUFFER, error);
+  curl_easy_setopt(m_handle, CURLOPT_ERRORBUFFER, m_error);
   curl_easy_setopt(m_handle, CURLOPT_PRIVATE, this);
   curl_easy_setopt(m_handle, CURLOPT_NOPROGRESS, 0);
   curl_easy_setopt(m_handle, CURLOPT_PROGRESSFUNCTION, prog_cb);
   curl_easy_setopt(m_handle, CURLOPT_PROGRESSDATA, this);
 
-  // setup the response object
-  this->response->name = url;
 }
 
-void HttpRequest::set_response_fd( int fd )
+HttpRequest::HttpRequest( Dispatch &dispatch, const std::string &url, int fd )
+  : Request( 0, url ),
+    m_response(new HttpResponse(url,fd)),
+    m_handle(curl_easy_init()),
+    m_client(dispatch.getHttpClient())
 {
-  if( this->response ){ delete this->response; this->response = NULL; }
-  m_fd = fd;
+  init_curl();
+}
+
+HttpRequest::HttpRequest( Dispatch &dispatch, const std::string &url )
+  : Request( 0, url ),
+    m_response(new HttpResponse(url)),
+    m_handle(curl_easy_init()),
+    m_client(dispatch.getHttpClient())
+{
+  init_curl();
 }
 
 HttpRequest::~HttpRequest()
 {
   curl_easy_cleanup( m_handle );
 #ifdef DEBUG
-  response = NULL;
+  m_response = NULL;
   m_handle = NULL;
   m_client = NULL;
 #endif
@@ -239,16 +254,82 @@ void HttpRequest::finish(CURLcode rc)
 {
   curl_multi_remove_handle( m_client->m_handle, m_handle );
 
-  if( this->response ) {
-    // add the response object here to the responses queue in the dispatcher?
-    // signaling to any waiting clients that their response is available
-    this->response->response_time = difftime( time(NULL), this->start_time );
-    m_client->m_disp->send_response( this->response );
+  // add the response object here to the responses queue in the dispatcher?
+  // signaling to any waiting clients that their response is available
+  m_response->response_time = Timer::elapsed_time( &(this->start_time) ); 
+  m_response->finish( m_client, rc );
+
+  //fprintf( stderr, "DONE: (%s/%s) => (%d), body(%d): '%s'\n", url.c_str(), url.c_str(), rc, (int)m_response, m_response->body.c_str() );
+}
+void HttpRequest::set_key( request_t key )
+{
+  Request::set_key(key);
+  m_response->id = key;
+}
+
+void HttpRequest::set_opt( const std::string &key, const std::string &value )
+{
+  Request::set_opt(key,value);
+  // convert the key into a curl value
+  // #define CURLOPTTYPE_LONG          0
+  // #define CURLOPTTYPE_OBJECTPOINT   10000
+  // #define CURLOPTTYPE_FUNCTIONPOINT 20000
+  // #define CURLOPTTYPE_OFF_T         30000
+
+  std::map<std::string,CURLoption> key_loopup;
+  // TODO: define this once for each resquest?
+  key_loopup["port"] = CURLOPT_PORT;
+  key_loopup["autoreferer"] = CURLOPT_AUTOREFERER;
+  key_loopup["followlocation"] = CURLOPT_FOLLOWLOCATION;
+  key_loopup["maxredirs"] = CURLOPT_MAXREDIRS;
+  key_loopup["referer"] = CURLOPT_REFERER;
+  key_loopup["useragent"] = CURLOPT_USERAGENT;
+  key_loopup["cookie"] = CURLOPT_COOKIE;
+
+  std::map<std::string,CURLoption>::iterator loc = key_loopup.find(key);
+  if( loc != key_loopup.end() ){
+    CURLoption val_type = loc->second;
+    if( val_type >= CURLOPTTYPE_LONG && val_type < CURLOPTTYPE_OBJECTPOINT ) {
+      long val = atoi(value.c_str());
+      printf( "set opt %s : %ld\n", key.c_str(), val );
+      curl_easy_setopt( m_handle, val_type, val );
+    }
+    else if( val_type >= CURLOPTTYPE_OBJECTPOINT && val_type < CURLOPTTYPE_FUNCTIONPOINT ) {
+      printf( "set opt %s : %s\n", key.c_str(), value.c_str() );
+      curl_easy_setopt( m_handle, val_type, value.c_str() );
+    }
+  }
+}
+
+HttpResponse::HttpResponse( const std::string &url )
+  : Response(url), m_fd(-1)
+{
+}
+HttpResponse::HttpResponse(  const std::string &url, int fd )
+  : Response(url), m_fd(fd)
+{
+}
+void HttpResponse::write( void *ptr, size_t realsize, size_t size, size_t nmemb )
+{
+  if( m_fd == -1 ) {
+    body.append((const char*)ptr,realsize);
+  }
+  else {
+    ::write( m_fd, ptr, realsize );
+  }
+}
+void HttpResponse::write_header( void *ptr, size_t realsize, size_t size, size_t nmemb )
+{
+  m_header.append((const char*)ptr,realsize);
+}
+void HttpResponse::finish( HttpClient *client, CURLcode rc )
+{
+  if( m_fd == -1 ) {
+    client->m_disp->send_response( this );
   }
   else {
     close( this->m_fd );
   }
-  //fprintf( stderr, "DONE: (%s/%s) => (%d), body(%d): '%s'\n", url.c_str(), url.c_str(), rc, (int)this->response, this->response->body.c_str() );
 }
 
 }

data/ext/revdispatch/libdispatch-0.1/src/ev_http.h

@@ -44,27 +44,41 @@ namespace EVD {
   // follow the curl handle for the duration of it's request
   struct HttpRequest : public Request {
     HttpRequest( Dispatch &dispatch, const std::string &url );
+    // use this to have the response be written to the file instead, using a response object.
+    // you can not get the response to return over the normal get_next_response or wait_for_response_by_id method if you use this.
+    HttpRequest( Dispatch &dispatch, const std::string &url, int fd );
     virtual ~HttpRequest();
 
     virtual bool enable();
 
     void finish( CURLcode rc );
 
-    virtual void set_key( request_t key ){ Request::set_key(key); if( this->response ) this->response->id = key; }
-
-    // use this to have the response be written to the file instead, using a response object.
-    // you can not get the response to return over the normal get_next_response or wait_for_response_by_id method if you use this.
-    void set_response_fd( int fd );
+    virtual void set_key( request_t key );
+    virtual void set_opt( const std::string &key, const std::string &value );
 
     static size_t write_cb(void *ptr, size_t size, size_t nmemb, void *data);
+    static size_t header_write_cb(void *ptr, size_t size, size_t nmemb, void *data);
     static int prog_cb(void *p, double dltotal, double dlnow, double ult, double uln);
 
-    Response *response;
+    struct HttpResponse *m_response;
 
     CURL *m_handle;
     HttpClient *m_client;
-    char error[CURL_ERROR_SIZE];
+    char m_error[CURL_ERROR_SIZE];
+  private:
+    void init_curl();
+  };
+
+  struct HttpResponse : public Response {
+    HttpResponse( const std::string &url );
+    HttpResponse( const std::string &url, int fd );
+
+    void write( void *ptr, size_t realsize, size_t size, size_t nmemb );
+    void write_header( void *ptr, size_t realsize, size_t size, size_t nmemb );
+    void finish( HttpClient *client, CURLcode rc );
+ 
     int m_fd;
+    std::string m_header;
   };
 
 }

data/ext/revdispatch/libdispatch-0.1/test/Makefile.am

@@ -1,4 +1,4 @@
-bin_PROGRAMS = next_test key_test pipe_test
+bin_PROGRAMS = next_test key_test pipe_test opt_test
 next_test_SOURCES = next_test.cc
 next_test_CPPFLAGS = -I$(top_srcdir)/src/ -I$(LIBEV_PATH)
 next_test_LDADD = -ldispatch -lev
@@ -13,3 +13,8 @@ pipe_test_SOURCES = pipe_test.cc
 pipe_test_CPPFLAGS = -I$(top_srcdir)/src/ -I$(LIBEV_PATH)
 pipe_test_LDADD = -ldispatch -lev
 pipe_test_LDFLAGS = -L$(top_srcdir)/src/.libs/ `curl-config --libs` -L$(LIBEV_PATH)/.libs/
+
+opt_test_SOURCES = opt_test.cc
+opt_test_CPPFLAGS = -I$(top_srcdir)/src/ -I$(LIBEV_PATH)
+opt_test_LDADD = -ldispatch -lev
+opt_test_LDFLAGS = -L$(top_srcdir)/src/.libs/ `curl-config --libs` -L$(LIBEV_PATH)/.libs/