CVS update: php3
| From: | shane | Date: | Thu, 24 Sep 1998 19:48:16 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1469@lists.php.net to get a copy of this message | ||
Date: Thursday September 24, 1998 @ 15:48
Author: shane
Update of /repository/php3
In directory asf:/u2/tmp/cvs-serv21964
Modified Files:
hyperwave.dsp mysql.dsp php3.dsp phpmysql.dsp request_info.c
Log Message:
fix leak in request_info on windows using apache cgi.
add support for mysql_real_connect and binary safe mysql_real_query for mysql v3.22+
Index: php3/hyperwave.dsp
diff -c php3/hyperwave.dsp:1.2 php3/hyperwave.dsp:1.3
*** php3/hyperwave.dsp:1.2 Fri Aug 14 17:57:44 1998
--- php3/hyperwave.dsp Thu Sep 24 15:48:15 1998
***************
*** 54,60 ****
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll
/machine:I386
! # ADD LINK32 php.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll
/machine:I386 /out:"module_Release/php3_hyperwave.dll" /libpath:"\src\lib"
/libpath:"\src\phpcvs\php3\cgi_release"
!ELSEIF "$(CFG)" == "hyperwave - Win32 Debug"
--- 54,60 ----
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll
/machine:I386
! # ADD LINK32 php.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo
/subsystem:windows /dll /machine:I386 /out:"module_Release/php3_hyperwave.dll"
/libpath:"\src\lib" /libpath:"\src\phpcvs\php3\cgi_release"
!ELSEIF "$(CFG)" == "hyperwave - Win32 Debug"
Index: php3/mysql.dsp
diff -c php3/mysql.dsp:1.11 php3/mysql.dsp:1.12
*** php3/mysql.dsp:1.11 Fri Aug 14 17:57:44 1998
--- php3/mysql.dsp Thu Sep 24 15:48:16 1998
***************
*** 42,48 ****
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MT /W3 /GX /O2 /I "c:\mysql\include" /I "\src\phpcvs\php3"
/D "MSVC5" /D "COMPILE_DL" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /I /usr/src/phpcvs/php3" /I /usr/src/mysql/include" "
" /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
--- 42,48 ----
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MT /W3 /GX /O2 /I "d:\src\mysql-3.22.7a\include" /I
"\src\phpcvs\php3" /D "MSVC5" /D "COMPILE_DL" /D "WIN32" /D
"NDEBUG" /D "_WINDOWS" /YX /FD /I /usr/src/phpcvs/php3" /I
/usr/src/mysql/include" " " /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
***************
*** 52,58 ****
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll
/machine:I386
! # ADD LINK32 php.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/nologo /subsystem:windows /dll /machine:I386 /out:"module_Release/php3_mysql.dll"
/libpath:"\src\phpcvs\php3\cgi_release" /libpath:"c:\mysql\lib"
!ELSEIF "$(CFG)" == "mysql - Win32 Debug"
--- 52,58 ----
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll
/machine:I386
! # ADD LINK32 php.lib libmysql.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/nologo /subsystem:windows /dll /machine:I386 /out:"module_Release/php3_mysql.dll"
/libpath:"\src\phpcvs\php3\cgi_debug"
/libpath:"d:\src\mysql-3.22.7a\lib_release"
!ELSEIF "$(CFG)" == "mysql - Win32 Debug"
***************
*** 68,74 ****
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\mysql\include" /I
"\src\phpcvs\php3" /D "DEBUG" /D "MSVC5" /D "COMPILE_DL" /D
"WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /I
/usr/src/phpcvs/php3" /I /usr/src/mysql/include" " " /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
--- 68,74 ----
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "d:\src\mysql-3.22.7a\include" /I
"\src\phpcvs\php3" /D "DEBUG" /D "MSVC5" /D "COMPILE_DL" /D
"WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /I
/usr/src/phpcvs/php3" /I /usr/src/mysql/include" " " /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
***************
*** 78,84 ****
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll
/debug /machine:I386 /pdbtype:sept
! # ADD LINK32 php.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/nologo /subsystem:windows /dll /debug /machine:I386 /out:"module_debug/php3_mysql.dll"
/pdbtype:sept /libpath:"\src\phpcvs\php3\cgi_debug" /libpath:"c:\mysql\lib"
!ENDIF
--- 78,84 ----
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll
/debug /machine:I386 /pdbtype:sept
! # ADD LINK32 php.lib libmysql.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/nologo /subsystem:windows /dll /debug /machine:I386 /out:"c:\php3/php3_mysql.dll"
/pdbtype:sept /libpath:"\src\phpcvs\php3\cgi_debug"
/libpath:"d:\src\mysql-3.22.7a\lib_debug"
!ENDIF
Index: php3/php3.dsp
diff -c php3/php3.dsp:1.41 php3/php3.dsp:1.42
*** php3/php3.dsp:1.41 Thu Aug 13 15:54:07 1998
--- php3/php3.dsp Thu Sep 24 15:48:16 1998
***************
*** 74,80 ****
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
! # ADD LINK32 lib44bsd95.lib resolv.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /debug /machine:I386
/out:"cgi_debug/php.exe" /pdbtype:sept /libpath:"\src\lib"
/libpath:"d:\src\bind\lib"
!ENDIF
--- 74,80 ----
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
! # ADD LINK32 lib44bsd95.lib resolv.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /debug /machine:I386
/out:"c:\php3/php.exe" /pdbtype:sept /libpath:"\src\lib"
/libpath:"d:\src\bind\lib"
!ENDIF
Index: php3/phpmysql.dsp
diff -c php3/phpmysql.dsp:1.16 php3/phpmysql.dsp:1.17
*** php3/phpmysql.dsp:1.16 Fri Aug 14 17:46:58 1998
--- php3/phpmysql.dsp Thu Sep 24 15:48:16 1998
***************
*** 42,48 ****
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "regex\\" /I
"c:\mysql\include" /I "d:\src\bind\include" /D "NDEBUG" /D
"MSVC5" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
--- 42,48 ----
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "regex\\" /I
"d:\src\mysql-3.22.7a\include" /I "d:\src\bind\include" /D "NDEBUG" /D
"MSVC5" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
***************
*** 50,56 ****
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/machine:I386
! # ADD LINK32 lib44bsd95.lib resolv.lib mysqlclient.lib winmm.lib snmpapi.lib wsock32.lib
netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
/out:"cgi_release/php.exe" /libpath:"c:\mysql\lib" /libpath:"\src\lib"
/libpath:"d:\src\bind\lib"
!ELSEIF "$(CFG)" == "phpmysql - Win32 Debug"
--- 50,56 ----
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/machine:I386
! # ADD LINK32 lib44bsd95.lib resolv.lib libmysql.lib winmm.lib snmpapi.lib wsock32.lib netapi32.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
/out:"cgi_release/php.exe" /libpath:"d:\src\mysql-3.22.7a\lib_release"
/libpath:"\src\lib" /libpath:"d:\src\bind\lib"
!ELSEIF "$(CFG)" == "phpmysql - Win32 Debug"
***************
*** 66,72 ****
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "." /I "regex\\" /I
"c:\mysql\include" /I "d:\src\bind\include" /D "DEBUG" /D
"_DEBUG" /D "MSVC5" /D "WIN32" /D "_CONSOLE" /D
"_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
--- 66,72 ----
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "." /I "regex\\" /I
"d:\src\mysql-3.22.7a\include" /I "d:\src\bind\include" /D "DEBUG" /D
"_DEBUG" /D "MSVC5" /D "WIN32" /D "_CONSOLE" /D
"_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
***************
*** 74,80 ****
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
! # ADD LINK32 lib44bsd95.lib resolv.lib mysqlclient.lib winmm.lib snmpapi.lib wsock32.lib
netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3 /subsystem:console /debug
/machine:I386 /out:"cgi_debug/php.exe" /pdbtype:sept /libpath:"c:\mysql\lib"
/libpath:"\src\lib" /libpath:"d:\src\bind\lib"
!ENDIF
--- 74,80 ----
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
! # ADD LINK32 lib44bsd95.lib resolv.lib libmysql.lib winmm.lib snmpapi.lib wsock32.lib netapi32.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3 /subsystem:console /debug
/machine:I386 /out:"c:\php3/php.exe" /pdbtype:sept
/libpath:"d:\src\mysql-3.22.7a\lib_debug" /libpath:"\src\lib"
/libpath:"d:\src\bind\lib"
!ENDIF
Index: php3/request_info.c
diff -c php3/request_info.c:1.38 php3/request_info.c:1.39
*** php3/request_info.c:1.38 Fri Aug 7 17:37:21 1998
--- php3/request_info.c Thu Sep 24 15:48:16 1998
***************
*** 65,71 ****
requires we get the info from path translated. This can be removed at
such a time taht apache nt is fixed */
else if (GLOBAL(request_info).path_translated) {
! GLOBAL(request_info).script_filename = estrdup(GLOBAL(request_info).path_translated);
} else {
GLOBAL(request_info).script_filename = NULL;
}
--- 65,71 ----
requires we get the info from path translated. This can be removed at
such a time taht apache nt is fixed */
else if (GLOBAL(request_info).path_translated) {
! GLOBAL(request_info).script_filename = GLOBAL(request_info).path_translated;
} else {
GLOBAL(request_info).script_filename = NULL;
}
--
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