Replaced libevent dependency with the getdns default event loop

Author: shollenbeck

ChangeLog

@@ -1,3 +1,7 @@
+* 2015-XX-XX: Version 0.8.1
+  * Removed the libevent dependency to use the getdns default event
+    loop instead.
+
 * 2015-07-13: Version 0.8.0
   * Added php_getdns_context_set_dns_transport_list() function.
   * Added php_getdns_context_set_idle_timeout() function.

README.md

@@ -1,16 +1,15 @@
 getdns-php
 ==========
 
-A PHP language binding for the getdns API, version 0.8.0.
+A PHP language binding for the getdns API, version 0.8.1.
 This implementation is licensed under the New BSD License (BSD-new).
 
 NOTE: THIS IS A BETA RELEASE!
 
 Dependencies:
 
 * PHP 5.x (PHP 5.6.8 was used for development and testing)
-* libgetdns 0.3.0 (configured with --with-libevent)
-* libgetdns_ext_event 0.3.0
+* libgetdns 0.3.*
 * getdns library header files
 
 The configure script will confirm that the dependencies have been met,

config.m4

@@ -18,24 +18,9 @@ if test "$PHP_GETDNS" != "no"; then
     AC_MSG_ERROR(Please install the libgetdns library)
   fi
 
-  AC_MSG_CHECKING(for libgetdns_ext_event in default path)
-  for i in /usr/local /usr; do
-    for j in so dylib; do
-      if test -r $i/lib/libgetdns_ext_event.$j; then
-        GETDNS_EVENT_DIR=$i
-        AC_MSG_RESULT(found libgetdns_ext_event.$j in $i)
-      fi
-    done
-  done
-
-  if test -z "$GETDNS_EVENT_DIR"; then
-    AC_MSG_RESULT(not found)
-    AC_MSG_ERROR(Please install the libgetdns_ext_event library)
-  fi
-
   AC_MSG_CHECKING([getdns header files])
   GETDNS_INC_DIR="/usr/local/include/getdns"
-  INC_FILES="$GETDNS_INC_DIR/getdns.h $GETDNS_INC_DIR/getdns_extra.h $GETDNS_INC_DIR/getdns_ext_libevent.h"
+  INC_FILES="$GETDNS_INC_DIR/getdns.h $GETDNS_INC_DIR/getdns_extra.h"
   for i in $INC_FILES; do
     if test ! -f $i; then
       AC_MSG_ERROR([getdns header files not found in $GETDNS_INC_DIR])
@@ -51,13 +36,12 @@ if test "$PHP_GETDNS" != "no"; then
       AC_MSG_ERROR([Invalid libgetdns.])
     ],
     [
-      -L$GETDNS_DIR/lib -lgetdns -lgetdns_ext_event
+      -L$GETDNS_DIR/lib -lgetdns
     ]
   )
 
   PHP_SUBST(GETDNS_SHARED_LIBADD)
   PHP_ADD_LIBRARY_WITH_PATH(getdns, $GETDNS_DIR/lib, GETDNS_SHARED_LIBADD)
-  PHP_ADD_LIBRARY_WITH_PATH(getdns_ext_event, $GETDNS_DIR/lib, GETDNS_SHARED_LIBADD)
   PHP_ADD_INCLUDE($GETDNS_INC_DIR)
   AC_DEFINE(HAVE_GETDNS, 1, [whether the getdns extension is enabled])
   PHP_NEW_EXTENSION(getdns, phpgetdns.c, $ext_shared)

doc-in/setup.xml

@@ -11,12 +11,7 @@
     <itemizedlist>
      <listitem>
      <para>
-      libgetdns 0.2.0
-     </para>
-     </listitem>
-     <listitem>
-     <para>
-      libgetdns_ext_event 0.2.0
+      libgetdns 0.3.0
      </para>
      </listitem>
      <listitem>

doc-out/index.sqlite

@@ -21,11 +21,6 @@ <h2 class="title">Requirements</h2>
      </p>
      </li>
      <li class="listitem">
-     <p class="para">
-      libgetdns_ext_event 0.3.0
-     </p>
-     </li>
-     <li class="listitem">
      <p class="para">
       getdns library header files
      </p>

doc-out/php-chunked-xhtml/getdns.requirements.html

@@ -57,7 +57,7 @@ ZEND_END_MODULE_GLOBALS(getdns)
 
 /* Miscellaneous definitions. */
 
-#define PHP_GETDNS_VERSION "0.8.0"
+#define PHP_GETDNS_VERSION "0.8.1"
 #define PHP_GETDNS_EXTNAME "getdns"
 
 /* PHP environment setup functions. */

php_getdns.h

@@ -46,7 +46,6 @@
 #include "php_ini.h"
 #include "php_getdns.h"
 #include "getdns.h"
-#include "getdns_ext_libevent.h"
 #include "getdns_extra.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(getdns)
@@ -1461,19 +1460,6 @@ PHP_FUNCTION(php_getdns_context_create)
     /* Store the context value and return the result. */
     convert_to_long(phpOut);
     ZVAL_LONG(phpOut, (long) context);
-
-    /* Create an event base for async functions. */
-    if (result == GETDNS_RETURN_GOOD) {
-        struct event_base *eventBase = (struct event_base *) (intptr_t) event_base_new();
-        if (eventBase == NULL) {
-	    result = GETDNS_RETURN_GENERIC_ERROR;
-	    ZVAL_LONG(phpOut, 0);
-            getdns_context_destroy(context);
-        }
-        else {
-	    (void) getdns_extension_set_libevent_base(context, eventBase);
-        }
-    }
     RETURN_LONG((long) result);
 }