com php-src: Removed support for ODBCRouter: NEWS UPGRADING ext/odbc/config.m4 ext/odbc/php_odbc.c ext/odbc/php_odb c_includes.h
| From: | Kalle Sommer Nielsen | Date: | Fri, 28 Jul 2017 08:31:48 +0000 |
| Subject: | com php-src: Removed support for ODBCRouter: NEWS UPGRADING ext/odbc/config.m4 ext/odbc/php_odbc.c ext/odbc/php_odb c_includes.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98842@lists.php.net to get a copy of this message | ||
Commit: 398be731e67113a860c43564370e3a22af46d2ec
Author: Kalle Sommer Nielsen <kalle@php.net> Fri, 28 Jul 2017 10:31:48 +0200
Parents: 87192f0fab437d5e6b91729bb1d294abc29a9de8
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=398be731e67113a860c43564370e3a22af46d2ec
Log:
Removed support for ODBCRouter
Changed paths:
M NEWS
M UPGRADING
M ext/odbc/config.m4
M ext/odbc/php_odbc.c
M ext/odbc/php_odbc_includes.h
Diff:
diff --git a/NEWS b/NEWS
index 1428222..cd00e03 100644
--- 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 aa7e4c5..e7bdad5 100644
--- 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 59771ce..fab3801 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -220,28 +220,6 @@ You need to source your DB2 environment before running PHP configure:
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]
(Empress Version >= 8.60 required)])
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index c0caefd..010eaa6 100644
--- 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];
@@ -2536,7 +2497,6 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd,
int
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");
SQLFreeConnect((*conn)->hdbc);
diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h
index 1495afb..7265fb5 100644
--- 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"