Removed support for ODBCRouter

diff --git a/NEWS b/NEWS
index 14282225192fb192f326f4a301360a9d576f4e28..cd00e033bfbb2146b1e948f8da8debbdef46950e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,7 @@ PHP                                                                        NEWS
     on Windows). (Nikita)
 
 - ODBC:
+  . Removed support for ODBCRouter. (Kalle)
   . Removed support for Birdstep. (Kalle)
 
 - phar:

diff --git a/UPGRADING b/UPGRADING
index aa7e4c570255e2b2a3c7e27e754039d079b2f6ee..e7bdad512f33988a56f7aa93da494f3e8160df92 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -60,6 +60,7 @@ Core:
   . Set default transfer mode to binary
 
  ODBC: 
+  . Support for ODBCRouter has been removed.
   . Support for Birdstep has been removed.
 
 ========================================

diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 59771ce55b6015061c6fa6f03562b4254a409f2b..fab38019a398c300a959cda513c4ed2acbe62057 100644 (file)
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -219,28 +219,6 @@ You need to source your DB2 environment before running PHP configure:
   fi
 fi
 
-if test -z "$ODBC_TYPE"; then
-PHP_ARG_WITH(ODBCRouter,,
-[  --with-ODBCRouter[=DIR]   Include ODBCRouter.com support [/usr]])
-
-  AC_MSG_CHECKING(for ODBCRouter.com support)
-  if test "$PHP_ODBCROUTER" != "no"; then
-    if test "$PHP_ODBCROUTER" = "yes"; then
-      PHP_ODBCROUTER=/usr
-    fi
-    ODBC_INCDIR=$PHP_ODBCROUTER/include
-    ODBC_LIBDIR=$PHP_ODBCROUTER/lib
-    ODBC_LFLAGS=-L$ODBC_LIBDIR
-    ODBC_INCLUDE=-I$ODBC_INCDIR
-    ODBC_LIBS=-lodbcsdk
-    ODBC_TYPE=ODBCRouter
-    AC_DEFINE(HAVE_ODBC_ROUTER,1,[ ])
-    AC_MSG_RESULT([$ext_output])
-  else
-    AC_MSG_RESULT(no)
-  fi
-fi
-
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH(empress,,
 [  --with-empress[=DIR]      Include Empress support [\$EMPRESSPATH]

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index c0caefd19d4ce554d295a10039196bbd97cf3c1f..010eaa6a18504aef22a4762726d4c536555ab656 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -2443,45 +2443,6 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int
        SQLSetConnectOption((*conn)->hdbc, SQL_TRANSLATE_OPTION,
                        SQL_SOLID_XLATOPT_NOCNV);
 #endif
-#ifdef HAVE_ODBC_ROUTER
-       {
-#define CONNSTRSIZE 2048
-        char *lpszConnStr = emalloc(CONNSTRSIZE);
-        if (lpszConnStr && db) {
-                short cbszConnStr;
-                if (strstr(db, ";")) {
-                        /* the caller has apparently passed a connection-string */
-                        if (strstr(db, "uid") || strstr(db, "UID")) {
-                                uid = NULL;
-                        }
-                        if (strstr(db, "pwd") || strstr(db, "PWD")) {
-                                pwd = NULL;
-                        }
-                        strlcpy( lpszConnStr, db, CONNSTRSIZE);
-                }
-                else {
-                        strcpy(lpszConnStr, "DSN=");
-                        strlcat(lpszConnStr, db, CONNSTRSIZE);
-                }
-                if (uid) {
-                        if (uid[0]) {
-                                strlcat(lpszConnStr, ";UID=", CONNSTRSIZE);
-                                strlcat(lpszConnStr, uid, CONNSTRSIZE);
-                                strlcat(lpszConnStr, ";", CONNSTRSIZE);
-                        }
-                        if (pwd) {
-                                if (pwd[0]) {
-                                        strlcat(lpszConnStr, "PWD=", CONNSTRSIZE);
-                                        strlcat(lpszConnStr, pwd, CONNSTRSIZE);
-                                        strlcat(lpszConnStr, ";", CONNSTRSIZE);
-                                }
-                        }
-                }
-                rc = SQLDriverConnect((*conn)->hdbc, NULL, lpszConnStr, SQL_NTS, lpszConnStr, CONNSTRSIZE, &cbszConnStr, SQL_DRIVER_NOPROMPT);
-                efree(lpszConnStr);
-        }
-       }
-#else
 #ifdef HAVE_OPENLINK
        {
                char dsnbuf[1024];
@@ -2535,7 +2496,6 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int
 #else
        rc = SQLConnect((*conn)->hdbc, db, SQL_NTS, uid, SQL_NTS, pwd, SQL_NTS);
 #endif
-#endif
 #endif
        if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
                odbc_sql_error(*conn, SQL_NULL_HSTMT, "SQLConnect");

diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h
index 1495afbb7161812eaa4a6add25bdc91fc516d672..7265fb505241648603311440b5a31d46234e35cd 100644 (file)
--- a/ext/odbc/php_odbc_includes.h
+++ b/ext/odbc/php_odbc_includes.h
@@ -121,20 +121,6 @@ PHP_FUNCTION(solid_fetch_prev);
 #include <sqlext.h>
 #define HAVE_SQL_EXTENDED_FETCH 1
 
-#elif defined(HAVE_ODBC_ROUTER) /* ODBCRouter.com */
-
-#ifdef CHAR
-#undef CHAR
-#endif
-
-#ifdef SQLCHAR
-#undef SQLCHAR
-#endif
-
-#define ODBC_TYPE "ODBCRouter"
-#include <odbcsdk.h>
-#undef HAVE_SQL_EXTENDED_FETCH
-
 #elif defined(HAVE_OPENLINK) /* OpenLink ODBC drivers */
 
 #define ODBC_TYPE "Openlink"