CVS update: php31/ext/msql
| From: | zeev | Date: | Thu, 20 Aug 1998 21:50:23 +0000 |
| Subject: | CVS update: php31/ext/msql | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-370@lists.php.net to get a copy of this message | ||
Date: Thursday August 20, 1998 @ 17:50
Author: zeev
Update of /repository/php31/ext/msql
In directory asf:/tmp/cvs-serv16450/ext/msql
Modified Files:
Makefile.am configure.in.stub msql.c
Log Message:
Plenty of fixes, mostly to virtual source dir support (works fine now)
Several fixes to modules
Index: php31/ext/msql/Makefile.am
diff -c php31/ext/msql/Makefile.am:2.2 php31/ext/msql/Makefile.am:2.3
*** php31/ext/msql/Makefile.am:2.2 Fri Jul 17 13:44:56 1998
--- php31/ext/msql/Makefile.am Thu Aug 20 17:50:22 1998
***************
*** 1,4 ****
## Process this file with automake to produce Makefile.in
! INCLUDES=@INCLUDES@ -I../../main -I../standard
noinst_LIBRARIES=libphpext_msql.a
libphpext_msql_a_SOURCES=msql.c
--- 1,4 ----
## Process this file with automake to produce Makefile.in
! INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/main -I@top_srcdir@/ext/standard
noinst_LIBRARIES=libphpext_msql.a
libphpext_msql_a_SOURCES=msql.c
Index: php31/ext/msql/configure.in.stub
diff -c php31/ext/msql/configure.in.stub:1.2 php31/ext/msql/configure.in.stub:1.3
*** php31/ext/msql/configure.in.stub:1.2 Fri Jul 17 13:44:57 1998
--- php31/ext/msql/configure.in.stub Thu Aug 20 17:50:22 1998
***************
*** 1,4 ****
! dnl $Id: configure.in.stub,v 1.2 1998/07/17 17:44:57 ssb Exp $ -*- sh -*-
divert(1)
dnl
--- 1,4 ----
! dnl $Id: configure.in.stub,v 1.3 1998/08/20 21:50:22 zeev Exp $ -*- sh -*-
divert(1)
dnl
***************
*** 7,13 ****
AC_DEFUN(AC_MSQL_VERSION,[
AC_MSG_CHECKING([mSQL version])
ac_php_oldcflags=$CFLAGS
! CFLAGS="$MSQL_INCLUDE $CFLAGS";
AC_TRY_COMPILE([#include <sys/types.h>
#include "msql.h"],[int i = IDX_TYPE],[
AC_DEFINE(MSQL1,0)
--- 7,13 ----
AC_DEFUN(AC_MSQL_VERSION,[
AC_MSG_CHECKING([mSQL version])
ac_php_oldcflags=$CFLAGS
! CFLAGS="-I$MSQL_INCDIR $CFLAGS";
AC_TRY_COMPILE([#include <sys/types.h>
#include "msql.h"],[int i = IDX_TYPE],[
AC_DEFINE(MSQL1,0)
Index: php31/ext/msql/msql.c
diff -c php31/ext/msql/msql.c:2.1 php31/ext/msql/msql.c:2.2
*** php31/ext/msql/msql.c:2.1 Fri Jul 3 12:24:31 1998
--- php31/ext/msql/msql.c Thu Aug 20 17:50:23 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: msql.c,v 2.1 1998/07/03 16:24:31 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: msql.c,v 2.2 1998/08/20 21:50:23 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 930,936 ****
}
if (sql_row[field_offset]) {
! if (php3_ini.magic_quotes_runtime) {
return_value->value.str.val =
_php3_addslashes(sql_row[field_offset],0,&return_value->value.str.len,0);
} else {
return_value->value.str.len = (sql_row[field_offset]?strlen(sql_row[field_offset]):0);
--- 930,936 ----
}
if (sql_row[field_offset]) {
! if (php3_ini_master.magic_quotes_runtime) {
return_value->value.str.val =
_php3_addslashes(sql_row[field_offset],0,&return_value->value.str.len,0);
} else {
return_value->value.str.len = (sql_row[field_offset]?strlen(sql_row[field_offset]):0);
***************
*** 1067,1073 ****
msqlFieldSeek(msql_result,0);
for (msql_field=msqlFetchField(msql_result),i=0; msql_field;
msql_field=msqlFetchField(msql_result),i++) {
if (msql_row[i]) {
! if (php3_ini.magic_quotes_runtime) {
add_get_index_string(return_value, i, _php3_addslashes(msql_row[i],0,NULL,0), (void **)
&yystype_ptr, 0);
} else {
add_get_index_string(return_value, i, msql_row[i], (void **) &yystype_ptr, 1);
--- 1067,1073 ----
msqlFieldSeek(msql_result,0);
for (msql_field=msqlFetchField(msql_result),i=0; msql_field;
msql_field=msqlFetchField(msql_result),i++) {
if (msql_row[i]) {
! if (php3_ini_master.magic_quotes_runtime) {
add_get_index_string(return_value, i, _php3_addslashes(msql_row[i],0,NULL,0), (void **)
&yystype_ptr, 0);
} else {
add_get_index_string(return_value, i, msql_row[i], (void **) &yystype_ptr, 1);
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net