[PHP-CVS] cvs: php-src(PHP_5_3) /win32 registry.c
edink Fri Oct 12 07:58:32 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32 registry.c
Log:
MFH (and build fix)
http://cvs.php.net/viewvc.cgi/php-src/win32/registry.c?r1=1.16.4.5r2=1.16.4.5.2.1diff_format=u
Index: php-src/win32/registry.c
diff -u php-src/win32/registry.c:1.16.4.5 php-src/win32/registry.c:1.16.4.5.2.1
--- php-src/win32/registry.c:1.16.4.5 Wed May 2 10:16:34 2007
+++ php-src/win32/registry.cFri Oct 12 07:58:32 2007
@@ -102,7 +102,7 @@
zend_hash_get_current_key_ex(parent_ht, index, index_len, num, 0, pos) ==
HASH_KEY_IS_STRING;
zend_hash_move_forward_ex(parent_ht, pos)) {
if (zend_hash_add(ht, index,
index_len, data, sizeof(zval*), NULL) == SUCCESS) {
- (*data)-refcount++;
+ Z_ADDREF_PP(data);
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main network.c
edink Fri Oct 12 08:08:02 2007 UTC
Modified files:
/php-src/main network.c
Log:
MFB: Fix build
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.128r2=1.129diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.128 php-src/main/network.c:1.129
--- php-src/main/network.c:1.128Wed Oct 10 23:23:54 2007
+++ php-src/main/network.c Fri Oct 12 08:08:02 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.128 2007/10/10 23:23:54 auroraeosrose Exp $ */
+/* $Id: network.c,v 1.129 2007/10/12 08:08:02 edink Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -91,7 +91,7 @@
# define SOCK_CONN_ERR SOCKET_ERROR
# define PHP_TIMEOUT_ERROR_VALUE WSAETIMEDOUT
-struct in6_addr in6addr_any = {0}; /* IN6ADDR_ANY_INIT; */
+const struct in6_addr in6addr_any = {0}; /* IN6ADDR_ANY_INIT; */
#else
# define SOCK_ERR -1
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/openssl xp_ssl.c
It seems that Ilia's time is more precious that anybody elses.
This thing needs fixing.
Edin
Marcus Boerger wrote:
Hello Ilia,
is HEAD so bad or are a few keystrokes hurting you so much?
Sunday, May 27, 2007, 7:05:51 PM, you wrote:
iliaa Sun May 27 17:05:51 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/opensslxp_ssl.c
Log:
Fixed bug #41236 (Regression in timeout handling of non-blocking SSL
connections during reads and writes).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.738r2=1.2027.2.547.2.739diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.738 php-src/NEWS:1.2027.2.547.2.739
--- php-src/NEWS:1.2027.2.547.2.738 Sun May 27 16:31:35 2007
+++ php-src/NEWSSun May 27 17:05:50 2007
@@ -4,6 +4,8 @@
- Fixed bug #41511 (Compile failure under IRIX 6.5.30 building md5.c).
(Jani)
- Fixed bug #41504 (json_decode() incorrectly decodes JSON arrays with empty
string keys). (Ilia)
+- Fixed bug #41236 (Regression in timeout handling of non-blocking SSL
+ connections during reads and writes). (Ilia)
24 May 2007, PHP 5.2.3RC1
- Changed CGI install target to php-cgi and 'make install' to install CLI
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.22.2.3.2.7r2=1.22.2.3.2.8diff_format=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.7
php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.8
--- php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.7 Wed Apr 4 10:44:55 2007
+++ php-src/ext/openssl/xp_ssl.cSun May 27 17:05:51 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_ssl.c,v 1.22.2.3.2.7 2007/04/04 10:44:55 tony2001 Exp $ */
+/* $Id: xp_ssl.c,v 1.22.2.3.2.8 2007/05/27 17:05:51 iliaa Exp $ */
#include php.h
#include ext/standard/file.h
@@ -84,7 +84,7 @@
return 0;
}
-static int handle_ssl_error(php_stream *stream, int nr_bytes TSRMLS_DC)
+static int handle_ssl_error(php_stream *stream, int nr_bytes, zend_bool
is_init TSRMLS_DC)
{
php_openssl_netstream_data_t *sslsock =
(php_openssl_netstream_data_t*)stream-abstract;
int err = SSL_get_error(sslsock-ssl_handle, nr_bytes);
@@ -104,7 +104,7 @@
/* re-negotiation, or perhaps the SSL layer needs
more
* packets: retry in next iteration */
errno = EAGAIN;
- retry = 1;
+ retry = is_init ? 1 : sslsock-s.is_blocked;
break;
case SSL_ERROR_SYSCALL:
if (ERR_peek_error() == 0) {
@@ -193,7 +193,7 @@
didwrite = SSL_write(sslsock-ssl_handle, buf,
count);
if (didwrite = 0) {
- retry = handle_ssl_error(stream, didwrite
TSRMLS_CC);
+ retry = handle_ssl_error(stream, didwrite, 0
TSRMLS_CC);
} else {
break;
}
@@ -226,7 +226,7 @@
nr_bytes = SSL_read(sslsock-ssl_handle, buf, count);
if (nr_bytes = 0) {
- retry = handle_ssl_error(stream, nr_bytes
TSRMLS_CC);
+ retry = handle_ssl_error(stream, nr_bytes, 0
TSRMLS_CC);
stream-eof = (retry == 0 errno !=
EAGAIN !SSL_pending(sslsock-ssl_handle));
} else {
@@ -373,7 +373,7 @@
}
if (!SSL_set_fd(sslsock-ssl_handle, sslsock-s.socket)) {
- handle_ssl_error(stream, 0 TSRMLS_CC);
+ handle_ssl_error(stream, 0, 1 TSRMLS_CC);
}
if (cparam-inputs.session) {
@@ -428,7 +428,7 @@
}
if (n = 0) {
- retry = handle_ssl_error(stream, n
TSRMLS_CC);
+ retry = handle_ssl_error(stream, n, 1
TSRMLS_CC);
} else {
break;
}
Best regards,
Marcus
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/apache2filter config.w32 /sapi/apache2handler config.w32
edink Fri May 4 18:17:55 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apache2filter config.w32
/php-src/sapi/apache2handlerconfig.w32
Log:
Update Apache 2 libs to 2.0.59 on the build box and standardize the dirs
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.w32?r1=1.1r2=1.1.2.1diff_format=u
Index: php-src/sapi/apache2filter/config.w32
diff -u php-src/sapi/apache2filter/config.w32:1.1
php-src/sapi/apache2filter/config.w32:1.1.2.1
--- php-src/sapi/apache2filter/config.w32:1.1 Wed Jul 5 10:12:42 2006
+++ php-src/sapi/apache2filter/config.w32 Fri May 4 18:17:55 2007
@@ -1,13 +1,13 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.1 2006/07/05 10:12:42 edink Exp $
+// $Id: config.w32,v 1.1.2.1 2007/05/04 18:17:55 edink Exp $
ARG_ENABLE('apache2filter', 'Build Apache 2.x filter', 'no');
if (PHP_APACHE2FILTER != no) {
- if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE2FILTER,
PHP_PHP_BUILD + \\apache2\\include)
- CHECK_LIB(libhttpd.lib, apache2filter,
PHP_PHP_BUILD + \\apache2\\lib)
- CHECK_LIB(libapr.lib, apache2filter, PHP_PHP_BUILD
+ \\apache2\\lib)
- CHECK_LIB(libaprutil.lib, apache2filter,
PHP_PHP_BUILD + \\apache2\\lib)
+ if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE2FILTER,
PHP_PHP_BUILD + \\include\\apache2)
+ CHECK_LIB(libhttpd.lib, apache2filter,
PHP_PHP_BUILD + \\lib\\apache2)
+ CHECK_LIB(libapr.lib, apache2filter, PHP_PHP_BUILD
+ \\lib\\apache2)
+ CHECK_LIB(libaprutil.lib, apache2filter,
PHP_PHP_BUILD + \\lib\\apache2)
) {
SAPI('apache2filter', 'sapi_apache2.c apache_config.c
php_functions.c',
'php' + PHP_VERSION + 'apache2_filter.dll',
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.w32?r1=1.1.6.1r2=1.1.6.2diff_format=u
Index: php-src/sapi/apache2handler/config.w32
diff -u php-src/sapi/apache2handler/config.w32:1.1.6.1
php-src/sapi/apache2handler/config.w32:1.1.6.2
--- php-src/sapi/apache2handler/config.w32:1.1.6.1 Sun May 7 00:09:20 2006
+++ php-src/sapi/apache2handler/config.w32 Fri May 4 18:17:55 2007
@@ -1,13 +1,13 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.1.6.1 2006/05/07 00:09:20 edink Exp $
+// $Id: config.w32,v 1.1.6.2 2007/05/04 18:17:55 edink Exp $
ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no');
if (PHP_APACHE2HANDLER != no) {
- if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE2HANDLER,
PHP_PHP_BUILD + \\apache2\\include)
- CHECK_LIB(libhttpd.lib, apache2handler,
PHP_PHP_BUILD + \\apache2\\lib)
- CHECK_LIB(libapr.lib, apache2handler, PHP_PHP_BUILD
+ \\apache2\\lib)
- CHECK_LIB(libaprutil.lib, apache2handler,
PHP_PHP_BUILD + \\apache2\\lib)
+ if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE2HANDLER,
PHP_PHP_BUILD + \\include\\apache2)
+ CHECK_LIB(libhttpd.lib, apache2handler,
PHP_PHP_BUILD + \\lib\\apache2)
+ CHECK_LIB(libapr.lib, apache2handler, PHP_PHP_BUILD
+ \\lib\\apache2)
+ CHECK_LIB(libaprutil.lib, apache2handler,
PHP_PHP_BUILD + \\lib\\apache2)
) {
SAPI('apache2handler', 'mod_php5.c sapi_apache2.c
apache_config.c php_functions.c',
'php' + PHP_VERSION + 'apache2.dll',
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2filter config.w32 /sapi/apache2handler config.w32
edink Fri May 4 18:19:37 2007 UTC
Modified files:
/php-src/sapi/apache2handlerconfig.w32
/php-src/sapi/apache2filter config.w32
Log:
MFB: Update Apache 2 libs to 2.0.59 on the build box and standardize the dirs
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.w32?r1=1.3r2=1.4diff_format=u
Index: php-src/sapi/apache2handler/config.w32
diff -u php-src/sapi/apache2handler/config.w32:1.3
php-src/sapi/apache2handler/config.w32:1.4
--- php-src/sapi/apache2handler/config.w32:1.3 Wed Feb 7 09:35:09 2007
+++ php-src/sapi/apache2handler/config.w32 Fri May 4 18:19:37 2007
@@ -1,13 +1,13 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.3 2007/02/07 09:35:09 tony2001 Exp $
+// $Id: config.w32,v 1.4 2007/05/04 18:19:37 edink Exp $
ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no');
if (PHP_APACHE2HANDLER != no) {
- if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE2HANDLER,
PHP_PHP_BUILD + \\apache2\\include)
- CHECK_LIB(libhttpd.lib, apache2handler,
PHP_PHP_BUILD + \\apache2\\lib)
- CHECK_LIB(libapr.lib, apache2handler, PHP_PHP_BUILD
+ \\apache2\\lib)
- CHECK_LIB(libaprutil.lib, apache2handler,
PHP_PHP_BUILD + \\apache2\\lib)
+ if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE2HANDLER,
PHP_PHP_BUILD + \\include\\apache2)
+ CHECK_LIB(libhttpd.lib, apache2handler,
PHP_PHP_BUILD + \\lib\\apache2)
+ CHECK_LIB(libapr.lib, apache2handler, PHP_PHP_BUILD
+ \\lib\\apache2)
+ CHECK_LIB(libaprutil.lib, apache2handler,
PHP_PHP_BUILD + \\lib\\apache2)
) {
SAPI('apache2handler', 'mod_php.c sapi_apache2.c
apache_config.c php_functions.c',
'php' + PHP_VERSION + 'apache2.dll',
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.w32?r1=1.1r2=1.2diff_format=u
Index: php-src/sapi/apache2filter/config.w32
diff -u php-src/sapi/apache2filter/config.w32:1.1
php-src/sapi/apache2filter/config.w32:1.2
--- php-src/sapi/apache2filter/config.w32:1.1 Wed Jul 5 10:12:42 2006
+++ php-src/sapi/apache2filter/config.w32 Fri May 4 18:19:37 2007
@@ -1,13 +1,13 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.1 2006/07/05 10:12:42 edink Exp $
+// $Id: config.w32,v 1.2 2007/05/04 18:19:37 edink Exp $
ARG_ENABLE('apache2filter', 'Build Apache 2.x filter', 'no');
if (PHP_APACHE2FILTER != no) {
- if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE2FILTER,
PHP_PHP_BUILD + \\apache2\\include)
- CHECK_LIB(libhttpd.lib, apache2filter,
PHP_PHP_BUILD + \\apache2\\lib)
- CHECK_LIB(libapr.lib, apache2filter, PHP_PHP_BUILD
+ \\apache2\\lib)
- CHECK_LIB(libaprutil.lib, apache2filter,
PHP_PHP_BUILD + \\apache2\\lib)
+ if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE2FILTER,
PHP_PHP_BUILD + \\include\\apache2)
+ CHECK_LIB(libhttpd.lib, apache2filter,
PHP_PHP_BUILD + \\lib\\apache2)
+ CHECK_LIB(libapr.lib, apache2filter, PHP_PHP_BUILD
+ \\lib\\apache2)
+ CHECK_LIB(libaprutil.lib, apache2filter,
PHP_PHP_BUILD + \\lib\\apache2)
) {
SAPI('apache2filter', 'sapi_apache2.c apache_config.c
php_functions.c',
'php' + PHP_VERSION + 'apache2_filter.dll',
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/gd gd.dsp
edink Thu May 3 02:55:11 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/gd gd.dsp Log: Fix build http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.dsp?r1=1.9.2.8.2.1r2=1.9.2.8.2.2diff_format=u Index: php-src/ext/gd/gd.dsp diff -u php-src/ext/gd/gd.dsp:1.9.2.8.2.1 php-src/ext/gd/gd.dsp:1.9.2.8.2.2 --- php-src/ext/gd/gd.dsp:1.9.2.8.2.1 Sat Mar 10 13:06:37 2007 +++ php-src/ext/gd/gd.dsp Thu May 3 02:55:11 2007 @@ -104,10 +104,6 @@ # End Source File # Begin Source File -SOURCE=.\gd_security.c -# End Source File -# Begin Source File - SOURCE=.\gdttf.c # End Source File # End Group @@ -335,6 +331,10 @@ # End Source File # Begin Source File +SOURCE=.\libgd\gd_security.c +# End Source File +# Begin Source File + SOURCE=.\libgd\gd_ss.c !IF $(CFG) == gd - Win32 Release_TS GD2 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/gd .cvsignore
edink Thu May 3 02:55:53 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/gd .cvsignore Log: No need for workspace files http://cvs.php.net/viewvc.cgi/php-src/ext/gd/.cvsignore?r1=1.10.4.1r2=1.10.4.1.2.1diff_format=u Index: php-src/ext/gd/.cvsignore diff -u php-src/ext/gd/.cvsignore:1.10.4.1 php-src/ext/gd/.cvsignore:1.10.4.1.2.1 --- php-src/ext/gd/.cvsignore:1.10.4.1 Sun Oct 10 16:22:37 2004 +++ php-src/ext/gd/.cvsignore Thu May 3 02:55:53 2007 @@ -4,6 +4,7 @@ *.plg *.opt *.ncb +*.dsw Release Release_inline Debug -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/ingres_ii ingres.dsp
edink Thu May 3 03:11:56 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/ingres_ii ingres.dsp Log: Fix build http://cvs.php.net/viewvc.cgi/php-src/ext/ingres_ii/ingres.dsp?r1=1.2r2=1.2.26.1diff_format=u Index: php-src/ext/ingres_ii/ingres.dsp diff -u php-src/ext/ingres_ii/ingres.dsp:1.2 php-src/ext/ingres_ii/ingres.dsp:1.2.26.1 --- php-src/ext/ingres_ii/ingres.dsp:1.2Mon Nov 13 22:28:57 2000 +++ php-src/ext/ingres_ii/ingres.dspThu May 3 03:11:56 2007 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D INGRES_EXPORTS /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_INGRES_II /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_II=1 /D ZTS=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\TSRM /I ..\..\..\php_build\include\ingres /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_INGRES_II /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_II=1 /D ZTS=1 /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d NDEBUG @@ -53,7 +53,7 @@ # 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 /dll /machine:I386 -# ADD LINK32 php4ts.lib oiapi.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 /dll /machine:I386 /out:..\..\Release_TS/php_ingres.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline +# ADD LINK32 php4ts.lib iilibapi.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 /dll /machine:I386 /out:..\..\Release_TS/php_ingres.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\php_build\lib !ELSEIF $(CFG) == ingres - Win32 Debug_TS @@ -68,8 +68,8 @@ # PROP Intermediate_Dir Debug_TS # PROP Ignore_Export_Lib 0 # PROP Target_Dir -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D INGRES_EXPORTS /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D PHP_EXPORTS /D COMPILE_DL_INGRES_II /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_II=1 /YX /FD /GZ /c +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D INGRES_EXPORTS /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D PHP_EXPORTS /D COMPILE_DL_INGRES_II /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_II=1 /YX /FD /GZ /c # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d _DEBUG -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mcrypt mcrypt.c
edink Thu May 3 03:15:01 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/mcrypt mcrypt.c Log: Fix build http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.77.4.7.4.3r2=1.77.4.7.4.4diff_format=u Index: php-src/ext/mcrypt/mcrypt.c diff -u php-src/ext/mcrypt/mcrypt.c:1.77.4.7.4.3 php-src/ext/mcrypt/mcrypt.c:1.77.4.7.4.4 --- php-src/ext/mcrypt/mcrypt.c:1.77.4.7.4.3Tue May 1 16:07:37 2007 +++ php-src/ext/mcrypt/mcrypt.c Thu May 3 03:15:01 2007 @@ -16,7 +16,7 @@ | Derick Rethans [EMAIL PROTECTED]| +--+ */ -/* $Id: mcrypt.c,v 1.77.4.7.4.3 2007/05/01 16:07:37 derick Exp $ */ +/* $Id: mcrypt.c,v 1.77.4.7.4.4 2007/05/03 03:15:01 edink Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -647,8 +647,8 @@ int argc, i, count; int *key_sizes; + MCRYPT_GET_TD_ARG argc = ZEND_NUM_ARGS(); - MCRYPT_GET_TD_ARG key_sizes = mcrypt_enc_get_supported_key_sizes (pm-td, count); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlrpc/libxmlrpc xml_to_xmlrpc.c
edink Thu May 3 04:16:32 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/xmlrpc/libxmlrpc xml_to_xmlrpc.c Log: Fix Windows Build http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c?r1=1.5.6.2r2=1.5.6.3diff_format=u Index: php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c diff -u php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5.6.2 php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5.6.3 --- php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5.6.2Sun Mar 4 18:24:49 2007 +++ php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.cThu May 3 04:16:32 2007 @@ -31,13 +31,13 @@ */ -static const char rcsid[] = #(@) $Id: xml_to_xmlrpc.c,v 1.5.6.2 2007/03/04 18:24:49 iliaa Exp $; +static const char rcsid[] = #(@) $Id: xml_to_xmlrpc.c,v 1.5.6.3 2007/05/03 04:16:32 edink Exp $; +#include php.h +#include main/snprintf.h #ifdef _WIN32 #include xmlrpc_win32.h #endif -#include php.h -#include main/snprintf.h #include string.h #include stdlib.h #include xml_to_xmlrpc.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xmlrpc/libxmlrpc xml_to_xmlrpc.c
edink Thu May 3 04:17:18 2007 UTC Modified files: /php-src/ext/xmlrpc/libxmlrpc xml_to_xmlrpc.c Log: MFB Fix Windows Build http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c?r1=1.6r2=1.7diff_format=u Index: php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c diff -u php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.6 php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.7 --- php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.6Wed Feb 21 14:24:44 2007 +++ php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.cThu May 3 04:17:18 2007 @@ -31,13 +31,13 @@ */ -static const char rcsid[] = #(@) $Id: xml_to_xmlrpc.c,v 1.6 2007/02/21 14:24:44 tony2001 Exp $; +static const char rcsid[] = #(@) $Id: xml_to_xmlrpc.c,v 1.7 2007/05/03 04:17:18 edink Exp $; +#include php.h +#include main/snprintf.h #ifdef _WIN32 #include xmlrpc_win32.h #endif -#include php.h -#include main/snprintf.h #include string.h #include stdlib.h #include xml_to_xmlrpc.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main php_version.h
edink Mon Apr 30 16:18:06 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/main php_version.h Log: Sync correctly with configure.in http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.32r2=1.112.2.37.2.33diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.32 php-src/main/php_version.h:1.112.2.37.2.33 --- php-src/main/php_version.h:1.112.2.37.2.32 Fri Apr 27 20:54:47 2007 +++ php-src/main/php_version.h Mon Apr 30 16:18:06 2007 @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 3 +#define PHP_RELEASE_VERSION 2 #define PHP_EXTRA_VERSION RC3-dev #define PHP_VERSION 5.2.2RC3-dev #define PHP_VERSION_ID 50202 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zlib php_zlib.def
edink Sun Apr 29 17:47:32 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/zlib php_zlib.def Log: Sync with zlib http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/php_zlib.def?r1=1.5.2.1r2=1.5.2.1.2.1diff_format=u Index: php-src/ext/zlib/php_zlib.def diff -u php-src/ext/zlib/php_zlib.def:1.5.2.1 php-src/ext/zlib/php_zlib.def:1.5.2.1.2.1 --- php-src/ext/zlib/php_zlib.def:1.5.2.1 Thu Dec 15 02:25:58 2005 +++ php-src/ext/zlib/php_zlib.def Sun Apr 29 17:47:31 2007 @@ -1,18 +1,60 @@ +LIBRARY +; zlib data compression library + EXPORTS - compress - compress2 - deflate - deflateEnd - deflateInit_ - deflateInit2_ - uncompress - inflateInit_ - inflateInit2_ - inflate - inflateEnd - crc32 - inflateReset - deflateReset - zlibVersion - zError - \ No newline at end of file +; basic functions +zlibVersion +deflate +deflateEnd +inflate +inflateEnd +; advanced functions +deflateSetDictionary +deflateCopy +deflateReset +deflateParams +deflateBound +deflatePrime +inflateSetDictionary +inflateSync +inflateCopy +inflateReset +inflateBack +inflateBackEnd +zlibCompileFlags +; utility functions +compress +compress2 +compressBound +uncompress +gzopen +gzdopen +gzsetparams +gzread +gzwrite +gzprintf +gzputs +gzgets +gzputc +gzgetc +gzungetc +gzflush +gzseek +gzrewind +gztell +gzeof +gzclose +gzerror +gzclearerr +; checksum functions +adler32 +crc32 +; various hacks, don't look :) +deflateInit_ +deflateInit2_ +inflateInit_ +inflateInit2_ +inflateBackInit_ +inflateSyncPoint +get_crc_table +zError -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zlib php_zlib.def
edink Sun Apr 29 17:47:57 2007 UTC Modified files: /php-src/ext/zlib php_zlib.def Log: MFB: Sync with zlib http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/php_zlib.def?r1=1.6r2=1.7diff_format=u Index: php-src/ext/zlib/php_zlib.def diff -u php-src/ext/zlib/php_zlib.def:1.6 php-src/ext/zlib/php_zlib.def:1.7 --- php-src/ext/zlib/php_zlib.def:1.6 Thu Dec 15 02:26:14 2005 +++ php-src/ext/zlib/php_zlib.def Sun Apr 29 17:47:56 2007 @@ -1,17 +1,60 @@ +LIBRARY +; zlib data compression library + EXPORTS - compress - compress2 - deflate - deflateEnd - deflateInit_ - deflateInit2_ - uncompress - inflateInit_ - inflateInit2_ - inflate - inflateEnd - crc32 - inflateReset - deflateReset - zlibVersion - zError +; basic functions +zlibVersion +deflate +deflateEnd +inflate +inflateEnd +; advanced functions +deflateSetDictionary +deflateCopy +deflateReset +deflateParams +deflateBound +deflatePrime +inflateSetDictionary +inflateSync +inflateCopy +inflateReset +inflateBack +inflateBackEnd +zlibCompileFlags +; utility functions +compress +compress2 +compressBound +uncompress +gzopen +gzdopen +gzsetparams +gzread +gzwrite +gzprintf +gzputs +gzgets +gzputc +gzgetc +gzungetc +gzflush +gzseek +gzrewind +gztell +gzeof +gzclose +gzerror +gzclearerr +; checksum functions +adler32 +crc32 +; various hacks, don't look :) +deflateInit_ +deflateInit2_ +inflateInit_ +inflateInit2_ +inflateBackInit_ +inflateSyncPoint +get_crc_table +zError -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main php_version.h
edink Fri Apr 27 20:54:47 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/main php_version.h Log: Sync with configure.in http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.31r2=1.112.2.37.2.32diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.31 php-src/main/php_version.h:1.112.2.37.2.32 --- php-src/main/php_version.h:1.112.2.37.2.31 Thu Apr 26 22:44:53 2007 +++ php-src/main/php_version.h Fri Apr 27 20:54:47 2007 @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 2 -#define PHP_EXTRA_VERSION RC2-dev -#define PHP_VERSION 5.2.2RC2-dev +#define PHP_RELEASE_VERSION 3 +#define PHP_EXTRA_VERSION RC3-dev +#define PHP_VERSION 5.2.2RC3-dev #define PHP_VERSION_ID 50202 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd config.w32 gd.c php_gd.h
On 17/04/2007, at 20.01, Antony Dovgal wrote: On 04/17/2007 09:53 PM, Pierre Joye wrote: On 4/17/07, Antony Dovgal [EMAIL PROTECTED] wrote: On 04/17/2007 09:29 PM, Marcus Boerger wrote: Hello Pierre-Alain, since when are we adding major new features to release branches? Pierre, please leave this function for HEAD only, we don't add new features to 5.2. Well, do you really see a problem in these two self contained functions? They don't affect anything else in ext/gd or php and are on windows only. Don't get me wrong, it's not about you or the functions. We have some rules and I believe everybody should abide by them. Hi Antony, Marcus, This is simply not true. 5.2.x is not simply bug fix release. Minor and major functionality is added all the time. If you're too lazy to read the CVS I can list them for you. So please don't comment on commits based on who is making them. Edin -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd config.w32 gd.c php_gd.h
Hello Marcus, Did I miss your mail to Dmitry about making *major* engine changes to add Win64 support? I must also have lost your mail to Jani for adding new features to FastCGI too? I think I need to double check my spam filter. Or was your response more in regard of *who* committed it than *what* was committed (major engine change versus two self-contained windows only functions)? Edin On 17/04/2007, at 20.51, Marcus Boerger wrote: Hello Edin, either way it is ridiculous to add new features in the middle of a releace process. We are not only in a release branch here. We are even in a middle of a release. In one that is even security focused. best regards marcus Tuesday, April 17, 2007, 8:27:50 PM, you wrote: On 17/04/2007, at 20.01, Antony Dovgal wrote: On 04/17/2007 09:53 PM, Pierre Joye wrote: On 4/17/07, Antony Dovgal [EMAIL PROTECTED] wrote: On 04/17/2007 09:29 PM, Marcus Boerger wrote: Hello Pierre-Alain, since when are we adding major new features to release branches? Pierre, please leave this function for HEAD only, we don't add new features to 5.2. Well, do you really see a problem in these two self contained functions? They don't affect anything else in ext/gd or php and are on windows only. Don't get me wrong, it's not about you or the functions. We have some rules and I believe everybody should abide by them. Hi Antony, Marcus, This is simply not true. 5.2.x is not simply bug fix release. Minor and major functionality is added all the time. If you're too lazy to read the CVS I can list them for you. So please don't comment on commits based on who is making them. Edin Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd config.w32 gd.c php_gd.h
On 17/04/2007, at 21.08, Marcus Boerger wrote: Hello Derick, Tuesday, April 17, 2007, 8:58:40 PM, you wrote: On Tue, 17 Apr 2007, Antony Dovgal wrote: On 04/17/2007 09:29 PM, Marcus Boerger wrote: Hello Pierre-Alain, since when are we adding major new features to release branches? Pierre, please leave this function for HEAD only, we don't add new features to 5.2. That's not true - we added many functions. I see no problems with those two new functions, but I think it'd be smarter to introduce them in 5.2.3 as we just released an RC. I don't think we should *then* add more functions as with this we need to keep releasing new RCs. Fine with me. Though personally I hope we create 5.3 from 5.2.2 and avoid this kind of discussion. Another option is to re-release RC1. Give people early chance to test win64 release? Or make 5.2.2 as mostly security release and leave these new features for 5.2.3. I don't think we need 5.3.x as long as we can maintain binary compatibility. Edin -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd config.w32 gd.c php_gd.h
On 17/04/2007, at 21.24, Marcus Boerger wrote: Hello Edin, it appears i should read cvs commits more carefully. I thought that win64 change was a pretty easy one not affecting anything else. Reviewing it again i get a different opinion. And sorry but I can't care less about FCGI and whether someone moves stuff from CLI to FCGI. Or did jani do more than we were discussing? And yet two self-contained functions inside #ifdef PHP_WIN32 in gd module warrant your scrutiny? But never mind. My only goal with my post was to promote even-handed application of the principle no new features after RC1. Edin -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main snprintf.c
Hey Marcus,
Yes, SIZEOF_LONG_LONG is defined to 8 in main/config.w32.h
#define SIZEOF_LONG_LONG 8 /* defined as __int64 */
Edin
Marcus Boerger wrote:
Hello Antony,
under windows, where this is coming from (iirc), there is __int64. Is
that mapped to SIZEOF_LONG_LONG and don't you need to check for the
actual value being 8?
best regards
marcus
Friday, April 13, 2007, 12:00:56 AM, you wrote:
tony2001Thu Apr 12 22:00:56 2007 UTC
Modified files:
/php-src/main snprintf.c
Log:
add support for %I64(u|d) to sprintf() utilities
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.54r2=1.55diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.54 php-src/main/snprintf.c:1.55
--- php-src/main/snprintf.c:1.54Mon Apr 9 15:35:49 2007
+++ php-src/main/snprintf.c Thu Apr 12 22:00:56 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: snprintf.c,v 1.54 2007/04/09 15:35:49 dmitry Exp $ */
+/* $Id: snprintf.c,v 1.55 2007/04/12 22:00:56 tony2001 Exp $ */
#include php.h
@@ -706,6 +706,16 @@
fmt++;
modifier = LM_LONG_DOUBLE;
break;
+ case 'I':
+ fmt++;
+#if SIZEOF_LONG_LONG
+ if (*fmt == '6' *(fmt+1) == '4') {
+ fmt += 2;
+ modifier = LM_LONG_LONG;
+ } else
+#endif
+ modifier = LM_LONG;
+ break;
case 'l':
fmt++;
#if SIZEOF_LONG_LONG
Best regards,
Marcus
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/imap php_imap.c
edink Thu Mar 22 00:08:55 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/imap php_imap.c Log: MFH: fix SSL connection on windows http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.142.2.44.2.11r2=1.142.2.44.2.12diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.142.2.44.2.11 php-src/ext/imap/php_imap.c:1.142.2.44.2.12 --- php-src/ext/imap/php_imap.c:1.142.2.44.2.11 Mon Jan 29 10:08:17 2007 +++ php-src/ext/imap/php_imap.c Thu Mar 22 00:08:55 2007 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] | +--+ */ -/* $Id: php_imap.c,v 1.142.2.44.2.11 2007/01/29 10:08:17 tony2001 Exp $ */ +/* $Id: php_imap.c,v 1.142.2.44.2.12 2007/03/22 00:08:55 edink Exp $ */ #define IMAP41 @@ -438,11 +438,11 @@ #if HAVE_IMAP_KRB defined(HAVE_IMAP_AUTH_GSS) auth_link(auth_gss); /* link in the gss authenticator */ #endif +#endif #ifdef HAVE_IMAP_SSL ssl_onceonlyinit (); #endif -#endif /* lets allow NIL */ REGISTER_LONG_CONSTANT(NIL, NIL, CONST_PERSISTENT | CONST_CS); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /win32/build confutils.js
edink Mon Mar 19 03:15:48 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/win32/buildconfutils.js Log: Make DLL only once (Wez) http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.5r2=1.60.2.1.2.6diff_format=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.60.2.1.2.5 php-src/win32/build/confutils.js:1.60.2.1.2.6 --- php-src/win32/build/confutils.js:1.60.2.1.2.5 Mon Jan 1 19:32:09 2007 +++ php-src/win32/build/confutils.jsMon Mar 19 03:15:48 2007 @@ -17,7 +17,7 @@ +--+ */ -// $Id: confutils.js,v 1.60.2.1.2.5 2007/01/01 19:32:09 iliaa Exp $ +// $Id: confutils.js,v 1.60.2.1.2.6 2007/03/19 03:15:48 edink Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -1045,7 +1045,9 @@ var resname = generate_version_info_resource(dllname, configure_module_dirname); var ld = @$(CC); - MFO.WriteLine($(BUILD_DIR)\\ + dllname + $(BUILD_DIR)\\ + libname + : $(DEPS_ + EXT + ) $( + EXT + _GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\ + resname); + MFO.WriteLine($(BUILD_DIR)\\ + libname + : $(BUILD_DIR)\\ + dllname); + MFO.WriteBlankLines(1); + MFO.WriteLine($(BUILD_DIR)\\ + dllname + : $(DEPS_ + EXT + ) $( + EXT + _GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\ + resname); MFO.WriteLine(\t + ld + $( + EXT + _GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_ + EXT + ) $(LIBS) $(BUILD_DIR)\\ + resname + /link /out:$(BUILD_DIR)\\ + dllname + $(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_ + EXT + )); MFO.WriteLine([EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)); MFO.WriteBlankLines(1); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
edink Mon Mar 19 03:16:18 2007 UTC Modified files: /php-src/win32/buildconfutils.js Log: MFB: Make DLL only once (Wez) http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.66r2=1.67diff_format=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.66 php-src/win32/build/confutils.js:1.67 --- php-src/win32/build/confutils.js:1.66 Mon Jan 29 04:40:46 2007 +++ php-src/win32/build/confutils.jsMon Mar 19 03:16:18 2007 @@ -17,7 +17,7 @@ +--+ */ -// $Id: confutils.js,v 1.66 2007/01/29 04:40:46 iliaa Exp $ +// $Id: confutils.js,v 1.67 2007/03/19 03:16:18 edink Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -1045,7 +1045,9 @@ var resname = generate_version_info_resource(dllname, configure_module_dirname); var ld = @$(CC); - MFO.WriteLine($(BUILD_DIR)\\ + dllname + $(BUILD_DIR)\\ + libname + : $(DEPS_ + EXT + ) $( + EXT + _GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\ + resname); + MFO.WriteLine($(BUILD_DIR)\\ + libname + : $(BUILD_DIR)\\ + dllname); + MFO.WriteBlankLines(1); + MFO.WriteLine($(BUILD_DIR)\\ + dllname + : $(DEPS_ + EXT + ) $( + EXT + _GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\ + resname); MFO.WriteLine(\t + ld + $( + EXT + _GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_ + EXT + ) $(LIBS) $(BUILD_DIR)\\ + resname + /link /out:$(BUILD_DIR)\\ + dllname + $(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_ + EXT + )); MFO.WriteLine([EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)); MFO.WriteBlankLines(1); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
edink Mon Mar 12 03:10:08 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Lib upgrade news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.584r2=1.2027.2.547.2.585diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.584 php-src/NEWS:1.2027.2.547.2.585 --- php-src/NEWS:1.2027.2.547.2.584 Sat Mar 10 12:18:36 2007 +++ php-src/NEWSMon Mar 12 03:10:08 2007 @@ -4,7 +4,7 @@ - Upgraded libraries bundled in the Windows distribution. (Edin) . c-client (imap) to version 2006e . libpq (PostgreSQL) to version 8.2.3 - . libmysql (MySQL) to version 5.0.36 + . libmysql (MySQL) to version 5.0.37 . openssl to version 0.9.8e - Upgraded SQLite 3 to version 3.3.13 (Ilia) - Upgraded PCRE to version 7.0 (Nuno) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/domxml domxml.dsp
edink Sun Mar 4 18:40:30 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/domxml domxml.dsp Log: Fixed exslt build (#40665) http://cvs.php.net/viewvc.cgi/php-src/ext/domxml/domxml.dsp?r1=1.6.4.3r2=1.6.4.3.4.1diff_format=u Index: php-src/ext/domxml/domxml.dsp diff -u php-src/ext/domxml/domxml.dsp:1.6.4.3 php-src/ext/domxml/domxml.dsp:1.6.4.3.4.1 --- php-src/ext/domxml/domxml.dsp:1.6.4.3 Mon Dec 22 16:51:50 2003 +++ php-src/ext/domxml/domxml.dsp Sun Mar 4 18:40:29 2007 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\..\Zend /I ..\..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL_DOMXML /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_STATIC=1 /D LIBXSLT_STATIC=1 /D LIBXML_THREAD_ENABLED /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_STATIC=1 /D LIBXSLT_STATIC=1 /D LIBXML_THREAD_ENABLED /D HAVE_DOMEXSLT=1 /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -54,7 +54,7 @@ # 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 php4ts.lib /nologo /dll /machine:I386 -# ADD LINK32 wsock32.lib php4ts.lib libxml2_a.lib libxslt_a.lib iconv.lib resolv.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 /dll /machine:I386 /out:..\..\Release_TS/php_domxml.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\bindlib_w32\Release /libpath:..\..\..\php_build\lib\libxslt +# ADD LINK32 wsock32.lib php4ts.lib libxml2_a.lib libxslt_a.lib libexslt_a.lib iconv.lib resolv.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 /dll /machine:I386 /out:..\..\Release_TS/php_domxml.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\bindlib_w32\Release /libpath:..\..\..\php_build\lib\libxslt # SUBTRACT LINK32 /pdb:none !ELSEIF $(CFG) == domxml - Win32 Debug_TS @@ -72,7 +72,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I mssql-70 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL_DOMXML /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_STATIC=1 /D LIBXSLT_STATIC=1 /D LIBXML_THREAD_ENABLED /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_STATIC=1 /D LIBXSLT_STATIC=1 /D LIBXML_THREAD_ENABLED /D HAVE_DOMEXSLT=1 /FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -82,7 +82,7 @@ # 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 php4ts.lib /nologo /dll /machine:I386 -# ADD LINK32 php4ts_debug.lib libxml2_a.lib libxslt_a.lib iconv.lib resolv.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 /dll /incremental:yes /debug /machine:I386 /nodefaultlib:msvcrt /out:..\..\Debug_TS/php_domxml.dll /libpath:..\..\Debug_TS /libpath:..\..\..\bindlib_w32\Release /libpath:..\..\..\php_build\lib\libxslt +# ADD LINK32 php4ts_debug.lib libxml2_a.lib libxslt_a.lib libexslt_a.lib iconv.lib resolv.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 /dll /incremental:yes /debug /machine:I386 /nodefaultlib:msvcrt /out:..\..\Debug_TS/php_domxml.dll
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
edink Sat Mar 3 23:10:17 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Library update http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.569r2=1.2027.2.547.2.570diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.569 php-src/NEWS:1.2027.2.547.2.570 --- php-src/NEWS:1.2027.2.547.2.569 Sat Mar 3 15:18:03 2007 +++ php-src/NEWSSat Mar 3 23:10:16 2007 @@ -5,6 +5,7 @@ . c-client (imap) to version 2006e . libpq (PostgreSQL) to version 8.2.3 . libmysql (MySQL) to version 5.0.36 + . openssl to version 0.9.8e - Upgraded SQLite 3 to version 3.3.13 (Ilia) - Upgraded PCRE to version 7.0 (Nuno) - Improved SPL (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /win32/build Makefile
edink Sun Mar 4 00:41:16 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/win32/buildMakefile Log: Check that manifest file exists before trying to embed it http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.5r2=1.35.2.1.2.6diff_format=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.35.2.1.2.5 php-src/win32/build/Makefile:1.35.2.1.2.6 --- php-src/win32/build/Makefile:1.35.2.1.2.5 Sat Jan 13 03:32:28 2007 +++ php-src/win32/build/MakefileSun Mar 4 00:41:16 2007 @@ -14,7 +14,7 @@ # | Author: Wez Furlong [EMAIL PROTECTED] | # +--+ # -# $Id: Makefile,v 1.35.2.1.2.5 2007/01/13 03:32:28 fmk Exp $ +# $Id: Makefile,v 1.35.2.1.2.6 2007/03/04 00:41:16 edink Exp $ # This is the makefile template for the win32 build CC=$(CL) @@ -59,8 +59,8 @@ _VC_MANIFEST_EMBED_EXE= _VC_MANIFEST_EMBED_DLL= !else -_VC_MANIFEST_EMBED_EXE= $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;1 -_VC_MANIFEST_EMBED_DLL= $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;2 +_VC_MANIFEST_EMBED_EXE= if exist [EMAIL PROTECTED] $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;1 +_VC_MANIFEST_EMBED_DLL= if exist [EMAIL PROTECTED] $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;2 !endif $(PHPDLL_RES): win32\build\template.rc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build Makefile
edink Sun Mar 4 00:41:36 2007 UTC Modified files: /php-src/win32/buildMakefile Log: MFB: Check that manifest file exists before trying to embed it http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.43r2=1.44diff_format=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.43 php-src/win32/build/Makefile:1.44 --- php-src/win32/build/Makefile:1.43 Mon Jan 29 04:40:46 2007 +++ php-src/win32/build/MakefileSun Mar 4 00:41:36 2007 @@ -14,7 +14,7 @@ # | Author: Wez Furlong [EMAIL PROTECTED] | # +--+ # -# $Id: Makefile,v 1.43 2007/01/29 04:40:46 iliaa Exp $ +# $Id: Makefile,v 1.44 2007/03/04 00:41:36 edink Exp $ # This is the makefile template for the win32 build CC=$(CL) @@ -59,8 +59,8 @@ _VC_MANIFEST_EMBED_EXE= _VC_MANIFEST_EMBED_DLL= !else -_VC_MANIFEST_EMBED_EXE= $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;1 -_VC_MANIFEST_EMBED_DLL= $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;2 +_VC_MANIFEST_EMBED_EXE= if exist [EMAIL PROTECTED] $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;1 +_VC_MANIFEST_EMBED_DLL= if exist [EMAIL PROTECTED] $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;2 !endif $(PHPDLL_RES): win32\build\template.rc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
edink Sat Mar 3 02:06:44 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Lib upgrade update http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.566r2=1.2027.2.547.2.567diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.566 php-src/NEWS:1.2027.2.547.2.567 --- php-src/NEWS:1.2027.2.547.2.566 Fri Mar 2 22:00:50 2007 +++ php-src/NEWSSat Mar 3 02:06:43 2007 @@ -4,6 +4,7 @@ - Upgraded libraries bundled in the Windows distribution. (Edin) . c-client (imap) to version 2006e . libpq (PostgreSQL) to version 8.2.3 + . libmysql (MySQL) to version 5.0.36 - Upgraded SQLite 3 to version 3.3.13 (Ilia) - Upgraded PCRE to version 7.0 (Nuno) - Added --ri switch to CLI which allows to check extension information. (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /sapi/apache php4apache.dsp /sapi/apache2handler php4apache2.dsp /sapi/pi3web php4pi3web.dsp
edink Sat Mar 3 03:12:20 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/sapi/apachephp4apache.dsp /php-src/sapi/apache2handlerphp4apache2.dsp /php-src/sapi/pi3webphp4pi3web.dsp Log: Use standardised locations for libs and includes http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php4apache.dsp?r1=1.13r2=1.13.16.1diff_format=u Index: php-src/sapi/apache/php4apache.dsp diff -u php-src/sapi/apache/php4apache.dsp:1.13 php-src/sapi/apache/php4apache.dsp:1.13.16.1 --- php-src/sapi/apache/php4apache.dsp:1.13 Sat Apr 6 15:36:55 2002 +++ php-src/sapi/apache/php4apache.dsp Sat Mar 3 03:12:20 2007 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D APACHEPHP4_EXPORTS /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ...\..\include /I ..\..\win32 /I ..\..\Zend /I ..\.. /I ..\..\..\bindlib_w32 /I ..\..\..\php_build\apache\src\include /I ..\..\main /I ..\..\TSRM /D ZEND_DEBUG=0 /D NDEBUG /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D _WINDOWS /D _USRDLL /D APACHEPHP4_EXPORTS /D WIN32 /D _MBCS /D APACHE_READDIR_H /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ...\..\include /I ..\..\regex /I ..\..\win32 /I ..\..\Zend /I ..\.. /I ..\..\..\bindlib_w32 /I ..\..\..\php_build\apache\src\include /I ..\..\main /I ..\..\TSRM /D ZEND_DEBUG=0 /D NDEBUG /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D _WINDOWS /D _USRDLL /D APACHEPHP4_EXPORTS /D WIN32 /D _MBCS /D APACHE_READDIR_H /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d NDEBUG @@ -70,7 +70,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D APACHEPHP4_EXPORTS /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ...\..\include /I ..\..\win32 /I ..\..\Zend /I ..\.. /I ..\..\..\bindlib_w32 /I ..\..\..\php_build\apache\src\include /I ..\..\main /I ..\..\TSRM /D _DEBUG /D ZEND_DEBUG=1 /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D _WINDOWS /D _USRDLL /D APACHEPHP4_EXPORTS /D WIN32 /D _MBCS /D APACHE_READDIR_H /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ...\..\include /I ..\..\regex /I ..\..\win32 /I ..\..\Zend /I ..\.. /I ..\..\..\bindlib_w32 /I ..\..\..\php_build\apache\src\include /I ..\..\main /I ..\..\TSRM /D _DEBUG /D ZEND_DEBUG=1 /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D _WINDOWS /D _USRDLL /D APACHEPHP4_EXPORTS /D WIN32 /D _MBCS /D APACHE_READDIR_H /FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d NDEBUG @@ -80,7 +80,7 @@ # 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 /dll /machine:I386 -# ADD LINK32 php4ts_debug.lib ApacheCore.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 /base:0x6000 /version:4.0 /dll /incremental:yes /debug /machine:I386 /out:..\..\Debug_TS/php4apache.dll /pdbtype:sept /libpath:..\..\..\php_build\apache\src\cored /libpath:..\..\Debug_TS /libpath:..\..\TSRM\Debug_TS /libpath:..\..\Zend\Debug_TS +# ADD LINK32 php4ts_debug.lib ApacheCore.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 /base:0x6000 /version:4.0 /dll /incremental:yes /debug /machine:I386 /pdbtype:sept /libpath:..\..\..\php_build\apache\src\cored /libpath:..\..\Debug_TS /libpath:..\..\TSRM\Debug_TS /libpath:..\..\Zend\Debug_TS !ELSEIF $(CFG) == php4apache - Win32 Release_TS_inline @@ -96,7 +96,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D APACHEPHP4_EXPORTS /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ...\..\include /I ..\..\win32 /I ..\..\Zend /I ..\.. /I ..\..\..\bindlib_w32 /I ..\..\..\php_build\apache\src\include /I ..\..\main /I ..\..\TSRM /D ZEND_DEBUG=0 /D ZEND_WIN32_FORCE_INLINE /D NDEBUG /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D _WINDOWS /D _USRDLL /D APACHEPHP4_EXPORTS /D WIN32 /D _MBCS /D APACHE_READDIR_H /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ...\..\include /I ..\..\regex /I ..\..\win32 /I ..\..\Zend /I ..\.. /I ..\..\..\bindlib_w32 /I ..\..\..\php_build\apache\src\include /I ..\..\main /I ..\..\TSRM /D ZEND_DEBUG=0 /D ZEND_WIN32_FORCE_INLINE /D NDEBUG /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D _WINDOWS /D _USRDLL /D APACHEPHP4_EXPORTS /D WIN32 /D _MBCS /D APACHE_READDIR_H /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/informix ifx.dsp
edink Sat Mar 3 03:31:11 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/informix ifx.dsp Log: Made compile without magic http://cvs.php.net/viewvc.cgi/php-src/ext/informix/ifx.dsp?r1=1.8.16.1r2=1.8.16.1.4.1diff_format=u Index: php-src/ext/informix/ifx.dsp diff -u php-src/ext/informix/ifx.dsp:1.8.16.1 php-src/ext/informix/ifx.dsp:1.8.16.1.4.1 --- php-src/ext/informix/ifx.dsp:1.8.16.1 Mon Sep 8 15:07:42 2003 +++ php-src/ext/informix/ifx.dspSat Mar 3 03:31:11 2007 @@ -43,7 +43,7 @@ # 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 ..\..\main /I ..\.. /I ..\..\Zend /I ..\..\TSRM /D NDEBUG /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL /D HAVE_IFX=1 /D HAVE_IUS=1 /D ZTS /D ZEND_WIN32=1 /D PHP_WIN32=1 /D IFX_VERSION=921 /D COMPILE_DL_INFORMIX=1 /D ZEND_DEBUG=0 /D HAVE_IFX_IUS=1 /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I ..\..\main /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I c:\ifx-client\incl\esql /D NDEBUG /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL /D HAVE_IFX=1 /D HAVE_IUS=1 /D ZTS /D ZEND_WIN32=1 /D PHP_WIN32=1 /D IFX_VERSION=921 /D COMPILE_DL_INFORMIX=1 /D ZEND_DEBUG=0 /D HAVE_IFX_IUS=1 /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -53,7 +53,7 @@ # 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 isqlt09a.lib php4ts.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:..\..\Release_TS/php_ifx.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline +# ADD LINK32 isqlt09a.lib php4ts.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:..\..\Release_TS/php_ifx.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:c:\ifx-client\lib !ELSEIF $(CFG) == ifx - Win32 Debug_TS @@ -69,7 +69,7 @@ # 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 ..\..\main /I ..\.. /I ..\..\Zend /I ..\..\TSRM /D _DEBUG /D ZEND_DEBUG=1 /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL /D HAVE_IFX=1 /D HAVE_IUS=1 /D ZTS /D ZEND_WIN32=1 /D PHP_WIN32=1 /D IFX_VERSION=921 /D COMPILE_DL_INFORMIX=1 /D HAVE_IFX_IUS=1 /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ..\..\main /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I c:\ifx-client\incl\esql /D _DEBUG /D ZEND_DEBUG=1 /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL /D HAVE_IFX=1 /D HAVE_IUS=1 /D ZTS /D ZEND_WIN32=1 /D PHP_WIN32=1 /D IFX_VERSION=921 /D COMPILE_DL_INFORMIX=1 /D HAVE_IFX_IUS=1 /YX /FD /c # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D _DEBUG /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x406 /d _DEBUG @@ -79,7 +79,7 @@ # 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 isqlt09a.lib php4ts_debug.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:Debug_TS/php_ifx.dll /pdbtype:sept /libpath:..\..\Debug_TS +# ADD LINK32 isqlt09a.lib php4ts_debug.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:Debug_TS/php_ifx.dll /pdbtype:sept /libpath:..\..\Debug_TS /libpath:c:\ifx-client\lib !ENDIF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/interbase interbase.dsp
edink Sat Mar 3 03:37:23 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/interbase interbase.dsp Log: Use standardised locations for libs and includes http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/interbase.dsp?r1=1.6r2=1.6.18.1diff_format=u Index: php-src/ext/interbase/interbase.dsp diff -u php-src/ext/interbase/interbase.dsp:1.6 php-src/ext/interbase/interbase.dsp:1.6.18.1 --- php-src/ext/interbase/interbase.dsp:1.6 Tue Sep 4 21:50:27 2001 +++ php-src/ext/interbase/interbase.dsp Sat Mar 3 03:37:23 2007 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\..\main /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\..\php_build\Interbase SDK\include /D _DEBUG /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D INTERBASE_EXPORTS /D ZEND_WIN32 /D PHP_WIN32 /D ZEND_DEBUG=1 /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\..\main /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\..\php_build\Interbase SDK\include /I ..\..\..\bindlib_w32 /D _DEBUG /D ZEND_DEBUG=1 /D ZTS /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D INTERBASE_EXPORTS /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_IBASE=1 /D COMPILE_DL_INTERBASE /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\..\main /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\..\php_build\include\interbase /I ..\..\..\bindlib_w32 /D _DEBUG /D ZEND_DEBUG=1 /D ZTS /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D INTERBASE_EXPORTS /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_IBASE=1 /D COMPILE_DL_INTERBASE /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d _DEBUG @@ -54,7 +54,7 @@ # 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 ib_util_ms.lib gds32_ms.lib php4ts_debug.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD 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 gds32_ms.lib php4ts_debug.lib /nologo /dll /debug /machine:I386 /out:..\..\Debug_TS/php_interbase.dll /pdbtype:sept /libpath:..\..\..\php_build\Interbase SDK\lib_ms /libpath:..\..\Debug_TS +# ADD 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 gds32_ms.lib php4ts_debug.lib /nologo /dll /debug /machine:I386 /out:..\..\Debug_TS/php_interbase.dll /pdbtype:sept /libpath:..\..\..\php_build\lib\interbase /libpath:..\..\Debug_TS !ELSEIF $(CFG) == interbase - Win32 Release_TS @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ..\..\main /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\..\php_build\Interbase SDK\include /D NDEBUG /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D INTERBASE_EXPORTS /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_IBASE=1 /D ZEND_DEBUG=0 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\..\main /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\..\php_build\Interbase SDK\include /I ..\..\..\bindlib_w32 /D NDEBUG /D ZEND_DEBUG=0 /D ZTS /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D INTERBASE_EXPORTS /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_IBASE=1 /D COMPILE_DL_INTERBASE /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\..\main /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\..\php_build\include\interbase /I ..\..\..\bindlib_w32 /D NDEBUG /D ZEND_DEBUG=0 /D ZTS /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D INTERBASE_EXPORTS /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_IBASE=1 /D COMPILE_DL_INTERBASE /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d NDEBUG @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 php4ts.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 ib_util_ms.lib gds32_ms.lib /nologo /dll /machine:I386 -# ADD LINK32 php4ts.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 gds32_ms.lib /nologo /dll /machine:I386 /out:..\..\Release_TS/php_interbase.dll /libpath:..\..\..\php_build\Interbase SDK\lib_ms /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline +# ADD LINK32 php4ts.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 gds32_ms.lib /nologo /dll /machine:I386 /out:..\..\Release_TS/php_interbase.dll /libpath:..\..\..\php_build\lib\interbase /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline !ENDIF -- PHP CVS Mailing List
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/snmp snmp.dsp
edink Sat Mar 3 03:40:04 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/snmp snmp.dsp Log: Use standardised locations for libs and includes http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/snmp.dsp?r1=1.1r2=1.1.26.1diff_format=u Index: php-src/ext/snmp/snmp.dsp diff -u php-src/ext/snmp/snmp.dsp:1.1 php-src/ext/snmp/snmp.dsp:1.1.26.1 --- php-src/ext/snmp/snmp.dsp:1.1 Sat Sep 30 17:39:13 2000 +++ php-src/ext/snmp/snmp.dsp Sat Mar 3 03:40:04 2007 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL_SNMP /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D SNMP_EXPORTS /D COMPILE_DL_SNMP /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_SNMP=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\..\php_build\include\ucd-snmp /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D SNMP_EXPORTS /D COMPILE_DL_SNMP /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_SNMP=1 /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL_SNMP /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D SNMP_EXPORTS /D COMPILE_DL_SNMP /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_SNMP=1 /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\..\php_build\include\ucd-snmp /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D SNMP_EXPORTS /D COMPILE_DL_SNMP /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_SNMP=1 /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/sybase_ct sybase_ct.dsp
edink Sat Mar 3 03:44:25 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/sybase_ct sybase_ct.dsp Log: Use standardised locations for libs and includes http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/sybase_ct.dsp?r1=1.2r2=1.2.26.1diff_format=u Index: php-src/ext/sybase_ct/sybase_ct.dsp diff -u php-src/ext/sybase_ct/sybase_ct.dsp:1.2 php-src/ext/sybase_ct/sybase_ct.dsp:1.2.26.1 --- php-src/ext/sybase_ct/sybase_ct.dsp:1.2 Thu Aug 24 17:48:30 2000 +++ php-src/ext/sybase_ct/sybase_ct.dsp Sat Mar 3 03:44:25 2007 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\..\Zend /I ..\..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D SYBASE_CT_EXPORTS /D COMPILE_DL_SYBASE_CT /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D WIN32 /D SYBASE_CT_EXPORTS /D COMPILE_DL_SYBASE_CT /D HAVE_SYBASE_CT=1 /D ZTS=1 /D ZEND_DEBUG=0 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D PHP_WIN32 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /I ..\..\..\php_build\include\sybase /D WIN32 /D SYBASE_CT_EXPORTS /D COMPILE_DL_SYBASE_CT /D HAVE_SYBASE_CT=1 /D ZTS=1 /D ZEND_DEBUG=0 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D PHP_WIN32 /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -54,7 +54,7 @@ # 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 php4ts.lib /nologo /dll /machine:I386 -# ADD LINK32 php4ts.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 libct.lib libcs.lib /nologo /dll /machine:I386 /out:..\..\Release_TS/php_sybase_ct.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline +# ADD LINK32 php4ts.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 libct.lib libcs.lib /nologo /dll /machine:I386 /out:..\..\Release_TS/php_sybase_ct.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\php_build\lib\sybase # SUBTRACT LINK32 /pdb:none !ELSEIF $(CFG) == sybase_ct - Win32 Debug_TS @@ -72,7 +72,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D SYBASE_CT_EXPORTS /D COMPILE_DL_SYBASE_CT /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D SYBASE_CT_EXPORTS /D COMPILE_DL_SYBASE_CT /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_SYBASE_CT=1 /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /I ..\..\..\php_build\include\sybase /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D SYBASE_CT_EXPORTS /D COMPILE_DL_SYBASE_CT /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_SYBASE_CT=1 /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -82,7 +82,7 @@ # 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 php4ts_debug.lib /nologo /dll /machine:I386 -# ADD LINK32 php4ts_debug.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 /dll /machine:I386 /out:..\..\Debug_TS/php_sybase_ct.dll /libpath:..\..\Debug_TS +# ADD LINK32 php4ts_debug.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 /dll /machine:I386 /out:..\..\Debug_TS/php_sybase_ct.dll /libpath:..\..\Debug_TS /libpath:..\..\..\php_build\lib\sybase !ENDIF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/imap imap.dsp
edink Thu Feb 22 20:32:11 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/imap imap.dsp Log: fix build http://cvs.php.net/viewvc.cgi/php-src/ext/imap/imap.dsp?r1=1.14.14.3r2=1.14.14.4diff_format=u Index: php-src/ext/imap/imap.dsp diff -u php-src/ext/imap/imap.dsp:1.14.14.3 php-src/ext/imap/imap.dsp:1.14.14.4 --- php-src/ext/imap/imap.dsp:1.14.14.3 Thu May 18 21:12:55 2006 +++ php-src/ext/imap/imap.dsp Thu Feb 22 20:32:11 2007 @@ -55,7 +55,7 @@ # 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 /dll /machine:I386 -# ADD 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 php4nts.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /machine:I386 /out:Release/php_imap.dll /libpath:..\..\Release /libpath:..\..\..\php_build\IMAP\C-Client +# ADD 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 php4nts.lib winmm.lib cclient.lib ws2_32.lib /nologo /dll /machine:I386 /out:Release/php_imap.dll /libpath:..\..\Release /libpath:..\..\..\php_build\IMAP\C-Client !ELSEIF $(CFG) == imap - Win32 Debug @@ -81,7 +81,7 @@ # 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 /dll /debug /machine:I386 /pdbtype:sept -# ADD 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 php4nts_debug.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /debug /machine:I386 /out:Debug/php_imap.dll /pdbtype:sept /libpath:..\..\Debug /libpath:..\..\..\php_build\IMAP\C-Client +# ADD 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 php4nts_debug.lib winmm.lib cclient.lib ws2_32.lib /nologo /dll /debug /machine:I386 /out:Debug/php_imap.dll /pdbtype:sept /libpath:..\..\Debug /libpath:..\..\..\php_build\IMAP\C-Client !ELSEIF $(CFG) == imap - Win32 Debug_TS @@ -107,7 +107,7 @@ # 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 /dll /debug /machine:I386 /pdbtype:sept -# ADD 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 php4ts_debug.lib wsock32.lib winmm.lib cclient.lib crypt32.lib /nologo /dll /debug /machine:I386 /out:..\..\Debug_TS/php_imap.dll /pdbtype:sept /libpath:..\..\..\\ /libpath:..\..\Debug_TS +# ADD 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 php4ts_debug.lib winmm.lib cclient.lib Crypt32.lib ws2_32.lib /nologo /dll /debug /machine:I386 /out:..\..\Debug_TS/php_imap.dll /pdbtype:sept /libpath:..\..\..\\ /libpath:..\..\Debug_TS !ELSEIF $(CFG) == imap - Win32 Release_TS @@ -133,7 +133,7 @@ # 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 /dll /machine:I386 -# ADD 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 php4ts.lib wsock32.lib winmm.lib cclient.lib Secur32.lib CertIdl.Lib crypt32.lib /nologo /dll /machine:I386 /nodefaultlib:LIBCMT /out:..\..\Release_TS/php_imap.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\php_build\imap +# ADD 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 php4ts.lib winmm.lib cclient.lib Secur32.lib CertIdl.Lib Crypt32.lib ws2_32.lib /nologo /dll /machine:I386 /nodefaultlib:LIBCMT /out:..\..\Release_TS/php_imap.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\php_build\imap # SUBTRACT LINK32 /nodefaultlib !ENDIF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/imap php_imap.c
edink Mon Feb 19 16:03:42 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/imap php_imap.c Log: Fixed bug #36496 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.546r2=1.2027.2.547.2.547diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.546 php-src/NEWS:1.2027.2.547.2.547 --- php-src/NEWS:1.2027.2.547.2.546 Sun Feb 18 16:54:59 2007 +++ php-src/NEWSMon Feb 19 16:03:42 2007 @@ -31,6 +31,7 @@ - Fixed bug #39836 (SplObjectStorage empty after unserialize). (Marcus) - Fixed bug #39322 (proc_terminate() destroys process resource). (Nuno) - Fixed bug #37799 (ftp_ssl_connect() falls back to non-ssl connection). (Nuno) +- Fixed bug #36496 (SSL support in imap_open() not working on Windows). (Edin) - Fixed bug #34794 (proc_close() hangs when used with two processes). (jdolecek at netbsd dot org, Nuno) http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.19r2=1.208.2.7.2.20diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.19 php-src/ext/imap/php_imap.c:1.208.2.7.2.20 --- php-src/ext/imap/php_imap.c:1.208.2.7.2.19 Fri Feb 16 13:28:03 2007 +++ php-src/ext/imap/php_imap.c Mon Feb 19 16:03:42 2007 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] | +--+ */ -/* $Id: php_imap.c,v 1.208.2.7.2.19 2007/02/16 13:28:03 tony2001 Exp $ */ +/* $Id: php_imap.c,v 1.208.2.7.2.20 2007/02/19 16:03:42 edink Exp $ */ #define IMAP41 @@ -475,11 +475,11 @@ auth_link(auth_gss); /* link in the gss authenticator */ #endif auth_link(auth_pla); /* link in the plain authenticator */ +#endif #ifdef HAVE_IMAP_SSL ssl_onceonlyinit (); #endif -#endif /* lets allow NIL */ REGISTER_LONG_CONSTANT(NIL, NIL, CONST_PERSISTENT | CONST_CS); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap php_imap.c
edink Mon Feb 19 16:04:14 2007 UTC Modified files: /php-src/ext/imap php_imap.c Log: MFB http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.236r2=1.237diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.236 php-src/ext/imap/php_imap.c:1.237 --- php-src/ext/imap/php_imap.c:1.236 Fri Feb 16 13:28:32 2007 +++ php-src/ext/imap/php_imap.c Mon Feb 19 16:04:14 2007 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] | +--+ */ -/* $Id: php_imap.c,v 1.236 2007/02/16 13:28:32 tony2001 Exp $ */ +/* $Id: php_imap.c,v 1.237 2007/02/19 16:04:14 edink Exp $ */ #define IMAP41 @@ -475,11 +475,11 @@ auth_link(auth_gss); /* link in the gss authenticator */ #endif auth_link(auth_pla); /* link in the plain authenticator */ +#endif #ifdef HAVE_IMAP_SSL ssl_onceonlyinit (); #endif -#endif /* lets allow NIL */ REGISTER_LONG_CONSTANT(NIL, NIL, CONST_PERSISTENT | CONST_CS); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pgsql config.w32
edink Mon Feb 19 17:26:15 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pgsql config.w32
Log:
Fixed bug #40371
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/config.w32?r1=1.7.4.4r2=1.7.4.5diff_format=u
Index: php-src/ext/pgsql/config.w32
diff -u php-src/ext/pgsql/config.w32:1.7.4.4
php-src/ext/pgsql/config.w32:1.7.4.5
--- php-src/ext/pgsql/config.w32:1.7.4.4Sun Feb 18 17:05:53 2007
+++ php-src/ext/pgsql/config.w32Mon Feb 19 17:26:15 2007
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7.4.4 2007/02/18 17:05:53 iliaa Exp $
+// $Id: config.w32,v 1.7.4.5 2007/02/19 17:26:15 edink Exp $
// vim:ft=javascript
ARG_WITH(pgsql, PostgreSQL support, no);
@@ -8,7 +8,7 @@
CHECK_HEADER_ADD_INCLUDE(libpq-fe.h, CFLAGS_PGSQL,
PHP_PGSQL + \\include; + PHP_PHP_BUILD + \\include\\pgsql; + PHP_PGSQL)) {
EXTENSION(pgsql, pgsql.c);
AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library');
- ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS
/D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D
HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS /D
HAVE_PQEXECPARAMS /D HAVE_PQPREPARE /D HAVE_PQEXECPREPARED /D
HAVE_PQRESULTERRORFIELD /D HAVE_PQSENDQUERYPARAMS /D HAVE_PQSENDPREPARE /D
HAVE_PQSENDQUERYPREPARED /D HAVE_PQPUTCOPYDATA /D HAVE_PQPUTCOPYEND /D
HAVE_PQGETCOPYDATA /D HAVE_PQSETERRORVERBOSITY /D HAVE_PQUNESCAPEBYTEA /D
HAVE_PQFTABLE /D HAVE_PQESCAPE_CONN /D HAVE_PQESCAPE_BYTEA_CONN /D
HAVE_PQFREEMEM);
+ ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS
/D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D
HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS /D
HAVE_PQEXECPARAMS /D HAVE_PQPREPARE /D HAVE_PQEXECPREPARED /D
HAVE_PQRESULTERRORFIELD /D HAVE_PQSENDQUERYPARAMS /D HAVE_PQSENDPREPARE /D
HAVE_PQSENDQUERYPREPARED /D HAVE_PQPUTCOPYDATA /D HAVE_PQPUTCOPYEND /D
HAVE_PQGETCOPYDATA /D HAVE_PQSETERRORVERBOSITY /D HAVE_PQUNESCAPEBYTEA /D
HAVE_PQFTABLE /D HAVE_PQESCAPE_CONN /D HAVE_PQESCAPE_BYTEA_CONN /D
HAVE_PQFREEMEM /D HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT);
} else {
WARNING(pgsql not enabled; libraries and headers not found);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
edink Mon Feb 19 17:32:54 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Info on new lib versions and BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.547r2=1.2027.2.547.2.548diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.547 php-src/NEWS:1.2027.2.547.2.548 --- php-src/NEWS:1.2027.2.547.2.547 Mon Feb 19 16:03:42 2007 +++ php-src/NEWSMon Feb 19 17:32:54 2007 @@ -1,6 +1,9 @@ PHPNEWS ||| ?? ??? 2007, PHP 5.2.2 +- Upgraded libraries bundled in the Windows distribution. (Edin) + . c-client (imap) to version 2006e + . libpq (PostgreSQL) to version 8.2.3 - Upgraded SQLite 3 to version 3.3.12 (Ilia) - Upgraded PCRE to version 7.0 (Nuno) - Add --ri switch to CLI which allows to check extension information. (Marcus) @@ -23,6 +26,7 @@ - Fixed bug #40414 (possible endless fork() loop when running fastcgi). (Dmitry) - Fixed bug #40410 (ext/posix does not compile on MacOS 10.3.9). (Tony) +- Fixed bug #40371 (pg_client_encoding() not working on Windows). (Edin) - Fixed Bug #40352 (FCGI_WEB_SERVER_ADDRS function get lost). (Dmitry) - Fixed bug #40286 (PHP fastcgi with PHP_FCGI_CHILDREN don't kill children when parent is killed). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build Makefile
edink Mon Jan 8 00:26:35 2007 UTC Modified files: /php-src/win32/buildMakefile Log: Make mt more silent http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.40r2=1.41diff_format=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.40 php-src/win32/build/Makefile:1.41 --- php-src/win32/build/Makefile:1.40 Tue Dec 19 10:26:44 2006 +++ php-src/win32/build/MakefileMon Jan 8 00:26:35 2007 @@ -14,7 +14,7 @@ # | Author: Wez Furlong [EMAIL PROTECTED] | # +--+ # -# $Id: Makefile,v 1.40 2006/12/19 10:26:44 edink Exp $ +# $Id: Makefile,v 1.41 2007/01/08 00:26:35 edink Exp $ # This is the makefile template for the win32 build CC=$(CL) @@ -55,8 +55,8 @@ # $(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc -_VC_MANIFEST_EMBED_EXE= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;1 -_VC_MANIFEST_EMBED_DLL= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;2 +_VC_MANIFEST_EMBED_EXE= $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;1 +_VC_MANIFEST_EMBED_DLL= $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;2 $(PHPDLL_RES): win32\build\template.rc $(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION=\PHP Script Interpreter\ \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /win32/build Makefile
edink Mon Jan 8 00:27:06 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/win32/buildMakefile Log: MFH: Make mt more silent http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.3r2=1.35.2.1.2.4diff_format=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.35.2.1.2.3 php-src/win32/build/Makefile:1.35.2.1.2.4 --- php-src/win32/build/Makefile:1.35.2.1.2.3 Mon Jan 1 19:32:09 2007 +++ php-src/win32/build/MakefileMon Jan 8 00:27:06 2007 @@ -14,7 +14,7 @@ # | Author: Wez Furlong [EMAIL PROTECTED] | # +--+ # -# $Id: Makefile,v 1.35.2.1.2.3 2007/01/01 19:32:09 iliaa Exp $ +# $Id: Makefile,v 1.35.2.1.2.4 2007/01/08 00:27:06 edink Exp $ # This is the makefile template for the win32 build CC=$(CL) @@ -55,8 +55,8 @@ # $(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc -_VC_MANIFEST_EMBED_EXE= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;1 -_VC_MANIFEST_EMBED_DLL= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;2 +_VC_MANIFEST_EMBED_EXE= $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;1 +_VC_MANIFEST_EMBED_DLL= $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;2 $(PHPDLL_RES): win32\build\template.rc $(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION=\PHP Script Interpreter\ \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/curl curl.dsp
edink Fri Jan 5 10:00:56 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/curl curl.dsp Log: New curl lib needs CURL_STATICLIB define when linked statically http://cvs.php.net/viewvc.cgi/php-src/ext/curl/curl.dsp?r1=1.4.8.1r2=1.4.8.1.4.1diff_format=u Index: php-src/ext/curl/curl.dsp diff -u php-src/ext/curl/curl.dsp:1.4.8.1 php-src/ext/curl/curl.dsp:1.4.8.1.4.1 --- php-src/ext/curl/curl.dsp:1.4.8.1 Tue Jul 22 12:34:38 2003 +++ php-src/ext/curl/curl.dsp Fri Jan 5 10:00:56 2007 @@ -46,7 +46,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL_CURL /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I ..\..\..\php_build\curl\include /D WIN32 /D CURL_EXPORTS /D COMPILE_DL_CURL /D ZTS=1 /D HAVE_CURL=1 /D ZEND_DEBUG=0 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D PHP_WIN32 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I ..\..\..\php_build\curl\include /D WIN32 /D CURL_EXPORTS /D COMPILE_DL_CURL /D ZTS=1 /D HAVE_CURL=1 /D ZEND_DEBUG=0 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D PHP_WIN32 /D CURL_STATICLIB /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -74,7 +74,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL_CURL /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I ..\..\..\php_build\curl\include /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D CURL_EXPORTS /D COMPILE_DL_CURL /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_CURL=1 /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I ..\..\..\php_build\curl\include /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D CURL_EXPORTS /D COMPILE_DL_CURL /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_CURL=1 /D CURL_STATICLIB /FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -102,7 +102,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D CURL_EXPORTS /D COMPILE_DL_CURL /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_CURL=1 /FR /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I ..\..\..\php_build\curl\include /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D CURL_EXPORTS /D COMPILE_DL_CURL /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_CURL=1 /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I ..\..\..\php_build\curl\include /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D CURL_EXPORTS /D COMPILE_DL_CURL /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_CURL=1 /D CURL_STATICLIB /FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -131,7 +131,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /D WIN32 /D CURL_EXPORTS /D COMPILE_DL_CURL /D ZTS=1 /D HAVE_CURL=1 /D ZEND_DEBUG=0 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D PHP_WIN32 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I ..\..\..\php_build\curl\include /D WIN32 /D CURL_EXPORTS /D COMPILE_DL_CURL /D ZTS=1 /D HAVE_CURL=1 /D ZEND_DEBUG=0 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D PHP_WIN32 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I ..\..\..\php_build\curl\include /D WIN32 /D CURL_EXPORTS /D COMPILE_DL_CURL /D ZTS=1 /D HAVE_CURL=1 /D ZEND_DEBUG=0 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D PHP_WIN32 /D CURL_STATICLIB /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG -- PHP CVS Mailing List (http://www.php.net/) To
[PHP-CVS] cvs: php-src(PHP_5_2) /win32/build Makefile config.w32 confutils.js mkdist.php
edink Tue Dec 19 10:26:02 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/win32/buildMakefile config.w32 confutils.js mkdist.php
Log:
Enable full build with newer Microsoft compilers
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.1r2=1.35.2.1.2.2diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.35.2.1.2.1
php-src/win32/build/Makefile:1.35.2.1.2.2
--- php-src/win32/build/Makefile:1.35.2.1.2.1 Fri Nov 10 10:30:46 2006
+++ php-src/win32/build/MakefileTue Dec 19 10:26:01 2006
@@ -14,12 +14,13 @@
# | Author: Wez Furlong [EMAIL PROTECTED] |
# +--+
#
-# $Id: Makefile,v 1.35.2.1.2.1 2006/11/10 10:30:46 dmitry Exp $
+# $Id: Makefile,v 1.35.2.1.2.2 2006/12/19 10:26:01 edink Exp $
# This is the makefile template for the win32 build
CC=$(CL)
LD=$(LINK)
MC=$(MC)
+MT=$(MT)
MCFILE=$(BUILD_DIR)\wsyslog.rc
@@ -54,6 +55,9 @@
# $(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc
+_VC_MANIFEST_EMBED_EXE= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;1
+_VC_MANIFEST_EMBED_DLL= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;2
+
$(PHPDLL_RES): win32\build\template.rc
$(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION=\PHP Script
Interpreter\ \
/d FILE_NAME=\$(PHPDLL)\ /d PRODUCT_NAME=\PHP Script
Interpreter\ \
@@ -62,6 +66,7 @@
$(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS)
$(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE)
@$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS)
$(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS)
$(STATIC_EXT_LDFLAGS)
+ [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)
$(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.5r2=1.40.2.8.2.6diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.5
php-src/win32/build/config.w32:1.40.2.8.2.6
--- php-src/win32/build/config.w32:1.40.2.8.2.5 Tue Dec 5 08:07:57 2006
+++ php-src/win32/build/config.w32 Tue Dec 19 10:26:01 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.5 2006/12/05 08:07:57 dmitry Exp $
+// $Id: config.w32,v 1.40.2.8.2.6 2006/12/19 10:26:01 edink Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -49,6 +49,9 @@
// avoid picking up midnight commander from cygwin
PATH_PROG('mc', WshShell.Environment(Process).Item(PATH));
+// Try locating manifest tool
+PATH_PROG('mt', WshShell.Environment(Process).Item(PATH));
+
// stick objects somewhere outside of the source tree
ARG_ENABLE('object-out-dir', 'Alternate location for binary objects during
build', '');
if (PHP_OBJECT_OUT_DIR.length) {
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.3r2=1.60.2.1.2.4diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.3
php-src/win32/build/confutils.js:1.60.2.1.2.4
--- php-src/win32/build/confutils.js:1.60.2.1.2.3 Fri Nov 10 10:38:07 2006
+++ php-src/win32/build/confutils.jsTue Dec 19 10:26:01 2006
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.60.2.1.2.3 2006/11/10 10:38:07 dmitry Exp $
+// $Id: confutils.js,v 1.60.2.1.2.4 2006/12/19 10:26:01 edink Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -877,6 +877,7 @@
var ldflags;
var resname;
var ld;
+ var manifest;
if (typeof(obj_dir) == undefined) {
sapiname_for_printing = configure_module_dirname;
@@ -908,11 +909,13 @@
if (makefiletarget.match(new RegExp(\\.dll$))) {
ldflags = /dll $(LDFLAGS);
+ manifest = [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL);
} else if (makefiletarget.match(new RegExp(\\.lib$))) {
ldflags = $(LDFLAGS);
ld = $(MAKE_LIB);
} else {
ldflags = $(LDFLAGS);
+ manifest = [EMAIL PROTECTED](_VC_MANIFEST_EMBED_EXE);
}
if (ld) {
@@ -922,6 +925,10 @@
MFO.WriteLine(\t + ld + /nologo + $( + SAPI +
_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_ + SAPI + ) $(BUILD_DIR)\\ +
resname + /link /out:$(BUILD_DIR)\\ + makefiletarget + + ldflags +
$(LDFLAGS_ + SAPI + ));
}
+ if (manifest) {
+ MFO.WriteLine(\t + manifest);
+ }
+
DEFINE('CFLAGS_' + SAPI + '_OBJ', '$(CFLAGS_' + SAPI + ')');
if (configure_module_dirname.match(pecl)) {
@@ -998,7 +1005,7 @@
var objs = null;
var EXT = extname.toUpperCase();
var extname_for_printing;
-
+
if (shared == null) {
[PHP-CVS] cvs: php-src /win32/build Makefile config.w32 confutils.js mkdist.php
edink Tue Dec 19 10:26:44 2006 UTC
Modified files:
/php-src/win32/buildMakefile config.w32 confutils.js mkdist.php
Log:
MFB: Enable full build with newer Microsoft compilers
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.39r2=1.40diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.39 php-src/win32/build/Makefile:1.40
--- php-src/win32/build/Makefile:1.39 Fri Nov 10 10:30:56 2006
+++ php-src/win32/build/MakefileTue Dec 19 10:26:44 2006
@@ -14,12 +14,13 @@
# | Author: Wez Furlong [EMAIL PROTECTED] |
# +--+
#
-# $Id: Makefile,v 1.39 2006/11/10 10:30:56 dmitry Exp $
+# $Id: Makefile,v 1.40 2006/12/19 10:26:44 edink Exp $
# This is the makefile template for the win32 build
CC=$(CL)
LD=$(LINK)
MC=$(MC)
+MT=$(MT)
MCFILE=$(BUILD_DIR)\wsyslog.rc
@@ -54,6 +55,9 @@
# $(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc
+_VC_MANIFEST_EMBED_EXE= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;1
+_VC_MANIFEST_EMBED_DLL= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;2
+
$(PHPDLL_RES): win32\build\template.rc
$(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION=\PHP Script
Interpreter\ \
/d FILE_NAME=\$(PHPDLL)\ /d PRODUCT_NAME=\PHP Script
Interpreter\ \
@@ -62,6 +66,7 @@
$(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS)
$(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE)
@$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS)
$(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS)
$(STATIC_EXT_LDFLAGS)
+ [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)
$(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.60r2=1.61diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.60 php-src/win32/build/config.w32:1.61
--- php-src/win32/build/config.w32:1.60 Tue Dec 5 08:08:33 2006
+++ php-src/win32/build/config.w32 Tue Dec 19 10:26:44 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.60 2006/12/05 08:08:33 dmitry Exp $
+// $Id: config.w32,v 1.61 2006/12/19 10:26:44 edink Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -48,6 +48,9 @@
// avoid picking up midnight commander from cygwin
PATH_PROG('mc', WshShell.Environment(Process).Item(PATH));
+// Try locating manifest tool
+PATH_PROG('mt', WshShell.Environment(Process).Item(PATH));
+
// stick objects somewhere outside of the source tree
ARG_ENABLE('object-out-dir', 'Alternate location for binary objects during
build', '');
if (PHP_OBJECT_OUT_DIR.length) {
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.64r2=1.65diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.64
php-src/win32/build/confutils.js:1.65
--- php-src/win32/build/confutils.js:1.64 Fri Nov 10 10:38:23 2006
+++ php-src/win32/build/confutils.jsTue Dec 19 10:26:44 2006
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.64 2006/11/10 10:38:23 dmitry Exp $
+// $Id: confutils.js,v 1.65 2006/12/19 10:26:44 edink Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -877,6 +877,7 @@
var ldflags;
var resname;
var ld;
+ var manifest;
if (typeof(obj_dir) == undefined) {
sapiname_for_printing = configure_module_dirname;
@@ -908,11 +909,13 @@
if (makefiletarget.match(new RegExp(\\.dll$))) {
ldflags = /dll $(LDFLAGS);
+ manifest = [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL);
} else if (makefiletarget.match(new RegExp(\\.lib$))) {
ldflags = $(LDFLAGS);
ld = $(MAKE_LIB);
} else {
ldflags = $(LDFLAGS);
+ manifest = [EMAIL PROTECTED](_VC_MANIFEST_EMBED_EXE);
}
if (ld) {
@@ -922,6 +925,10 @@
MFO.WriteLine(\t + ld + /nologo + $( + SAPI +
_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_ + SAPI + ) $(BUILD_DIR)\\ +
resname + /link /out:$(BUILD_DIR)\\ + makefiletarget + + ldflags +
$(LDFLAGS_ + SAPI + ));
}
+ if (manifest) {
+ MFO.WriteLine(\t + manifest);
+ }
+
DEFINE('CFLAGS_' + SAPI + '_OBJ', '$(CFLAGS_' + SAPI + ')');
if (configure_module_dirname.match(pecl)) {
@@ -998,7 +1005,7 @@
var objs = null;
var EXT = extname.toUpperCase();
var extname_for_printing;
-
+
if (shared == null) {
eval(shared = PHP_ + EXT + _SHARED;);
}
@@ -1040,6 +1047,7 @@
MFO.WriteLine($(BUILD_DIR)\\ + dllname + $(BUILD_DIR)\\ +
libname + : $(DEPS_ + EXT + ) $( + EXT
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
edink Tue Dec 19 10:34:10 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: Updated list of available extensions in dlls. Updated oci extension ini settings. -- christopher.jones at oracle dot com http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.12r2=1.231.2.10.2.13diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.12 php-src/php.ini-dist:1.231.2.10.2.13 --- php-src/php.ini-dist:1.231.2.10.2.12Sat Oct 14 15:06:11 2006 +++ php-src/php.ini-distTue Dec 19 10:34:10 2006 @@ -583,40 +583,51 @@ ; extension folders as well as the separate PECL DLL download (PHP 5). ; Be sure to appropriately set the extension_dir directive. -;extension=php_mbstring.dll ;extension=php_bz2.dll ;extension=php_curl.dll ;extension=php_dba.dll ;extension=php_dbase.dll ;extension=php_exif.dll ;extension=php_fdf.dll -;extension=php_filepro.dll ;extension=php_gd2.dll ;extension=php_gettext.dll +;extension=php_gmp.dll ;extension=php_ifx.dll ;extension=php_imap.dll ;extension=php_interbase.dll ;extension=php_ldap.dll +;extension=php_mbstring.dll ;extension=php_mcrypt.dll ;extension=php_mhash.dll ;extension=php_mime_magic.dll ;extension=php_ming.dll -;extension=php_mssql.dll ;extension=php_msql.dll +;extension=php_mssql.dll ;extension=php_mysql.dll +;extension=php_mysqli.dll ;extension=php_oci8.dll ;extension=php_openssl.dll -;extension=php_oracle.dll +;extension=php_pdo.dll +;extension=php_pdo_firebird.dll +;extension=php_pdo_mssql.dll +;extension=php_pdo_mysql.dll +;extension=php_pdo_oci.dll +;extension=php_pdo_oci8.dll +;extension=php_pdo_odbc.dll +;extension=php_pdo_pgsql.dll +;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll +;extension=php_pspell.dll ;extension=php_shmop.dll ;extension=php_snmp.dll +;extension=php_soap.dll ;extension=php_sockets.dll ;extension=php_sqlite.dll ;extension=php_sybase_ct.dll ;extension=php_tidy.dll ;extension=php_xmlrpc.dll ;extension=php_xsl.dll - +;extension=php_zip.dll ;;; ; Module Settings ; @@ -784,6 +795,37 @@ ; Maximum number of links (persistent+non persistent). -1 means no limit. msql.max_links = -1 +[OCI8] +; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA) +;oci8.privileged_connect = Off + +; Connection: The maximum number of persistent OCI8 connections per +; process. Using -1 means no limit. +;oci8.max_persistent = -1 + +; Connection: The maximum number of seconds a process is allowed to +; maintain an idle persistent connection. Using -1 means idle +; persistent connections will be maintained forever. +;oci8.persistent_timeout = -1 + +; Connection: The number of seconds that must pass before issuing a +; ping during oci_pconnect() to check the connection validity. When +; set to 0, each oci_pconnect() will cause a ping. Using -1 disables +; pings completely. +;oci8.ping_interval = 60 + +; Tuning: This option enables statement caching, and specifies how +; many statements to cache. Using 0 disables statement caching. +;oci8.statement_cache_size = 20 + +; Tuning: Enables statement prefetching and sets the default number of +; rows that will be fetched automatically after statement execution. +;oci8.default_prefetch = 10 + +; Compatibility. Using On means oci_close() will not close +; oci_connect() and oci_new_connect() connections. +;oci8.old_oci_close_semantics = Off + [PostgresSQL] ; Allow or prevent persistent links. pgsql.allow_persistent = On http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.12r2=1.179.2.11.2.13diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.12 php-src/php.ini-recommended:1.179.2.11.2.13 --- php-src/php.ini-recommended:1.179.2.11.2.12 Sat Oct 14 15:06:11 2006 +++ php-src/php.ini-recommended Tue Dec 19 10:34:10 2006 @@ -628,40 +628,51 @@ ; extension folders as well as the separate PECL DLL download (PHP 5). ; Be sure to appropriately set the extension_dir directive. -;extension=php_mbstring.dll ;extension=php_bz2.dll ;extension=php_curl.dll ;extension=php_dba.dll ;extension=php_dbase.dll ;extension=php_exif.dll ;extension=php_fdf.dll -;extension=php_filepro.dll ;extension=php_gd2.dll ;extension=php_gettext.dll +;extension=php_gmp.dll ;extension=php_ifx.dll ;extension=php_imap.dll ;extension=php_interbase.dll ;extension=php_ldap.dll +;extension=php_mbstring.dll ;extension=php_mcrypt.dll ;extension=php_mhash.dll ;extension=php_mime_magic.dll ;extension=php_ming.dll -;extension=php_mssql.dll ;extension=php_msql.dll +;extension=php_mssql.dll ;extension=php_mysql.dll +;extension=php_mysqli.dll ;extension=php_oci8.dll ;extension=php_openssl.dll -;extension=php_oracle.dll +;extension=php_pdo.dll +;extension=php_pdo_firebird.dll +;extension=php_pdo_mssql.dll +;extension=php_pdo_mysql.dll +;extension=php_pdo_oci.dll
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended
edink Tue Dec 19 10:34:58 2006 UTC Modified files: /php-srcphp.ini-dist php.ini-recommended Log: MFB http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.257r2=1.258diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.257 php-src/php.ini-dist:1.258 --- php-src/php.ini-dist:1.257 Sat Oct 14 15:07:36 2006 +++ php-src/php.ini-distTue Dec 19 10:34:58 2006 @@ -509,40 +509,51 @@ ; extension folders as well as the separate PECL DLL download (PHP 5). ; Be sure to appropriately set the extension_dir directive. -;extension=php_mbstring.dll ;extension=php_bz2.dll ;extension=php_curl.dll ;extension=php_dba.dll ;extension=php_dbase.dll ;extension=php_exif.dll ;extension=php_fdf.dll -;extension=php_filepro.dll ;extension=php_gd2.dll ;extension=php_gettext.dll +;extension=php_gmp.dll ;extension=php_ifx.dll ;extension=php_imap.dll ;extension=php_interbase.dll ;extension=php_ldap.dll +;extension=php_mbstring.dll ;extension=php_mcrypt.dll ;extension=php_mhash.dll ;extension=php_mime_magic.dll ;extension=php_ming.dll -;extension=php_mssql.dll ;extension=php_msql.dll +;extension=php_mssql.dll ;extension=php_mysql.dll +;extension=php_mysqli.dll ;extension=php_oci8.dll ;extension=php_openssl.dll -;extension=php_oracle.dll +;extension=php_pdo.dll +;extension=php_pdo_firebird.dll +;extension=php_pdo_mssql.dll +;extension=php_pdo_mysql.dll +;extension=php_pdo_oci.dll +;extension=php_pdo_oci8.dll +;extension=php_pdo_odbc.dll +;extension=php_pdo_pgsql.dll +;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll +;extension=php_pspell.dll ;extension=php_shmop.dll ;extension=php_snmp.dll +;extension=php_soap.dll ;extension=php_sockets.dll ;extension=php_sqlite.dll ;extension=php_sybase_ct.dll ;extension=php_tidy.dll ;extension=php_xmlrpc.dll ;extension=php_xsl.dll - +;extension=php_zip.dll ;;; ; Module Settings ; @@ -710,6 +721,37 @@ ; Maximum number of links (persistent+non persistent). -1 means no limit. msql.max_links = -1 +[OCI8] +; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA) +;oci8.privileged_connect = Off + +; Connection: The maximum number of persistent OCI8 connections per +; process. Using -1 means no limit. +;oci8.max_persistent = -1 + +; Connection: The maximum number of seconds a process is allowed to +; maintain an idle persistent connection. Using -1 means idle +; persistent connections will be maintained forever. +;oci8.persistent_timeout = -1 + +; Connection: The number of seconds that must pass before issuing a +; ping during oci_pconnect() to check the connection validity. When +; set to 0, each oci_pconnect() will cause a ping. Using -1 disables +; pings completely. +;oci8.ping_interval = 60 + +; Tuning: This option enables statement caching, and specifies how +; many statements to cache. Using 0 disables statement caching. +;oci8.statement_cache_size = 20 + +; Tuning: Enables statement prefetching and sets the default number of +; rows that will be fetched automatically after statement execution. +;oci8.default_prefetch = 10 + +; Compatibility. Using On means oci_close() will not close +; oci_connect() and oci_new_connect() connections. +;oci8.old_oci_close_semantics = Off + [PostgresSQL] ; Allow or prevent persistent links. pgsql.allow_persistent = On http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.206r2=1.207diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.206 php-src/php.ini-recommended:1.207 --- php-src/php.ini-recommended:1.206 Sat Oct 14 15:07:36 2006 +++ php-src/php.ini-recommended Tue Dec 19 10:34:58 2006 @@ -540,40 +540,51 @@ ; extension folders as well as the separate PECL DLL download (PHP 5). ; Be sure to appropriately set the extension_dir directive. -;extension=php_mbstring.dll ;extension=php_bz2.dll ;extension=php_curl.dll ;extension=php_dba.dll ;extension=php_dbase.dll ;extension=php_exif.dll ;extension=php_fdf.dll -;extension=php_filepro.dll ;extension=php_gd2.dll ;extension=php_gettext.dll +;extension=php_gmp.dll ;extension=php_ifx.dll ;extension=php_imap.dll ;extension=php_interbase.dll ;extension=php_ldap.dll +;extension=php_mbstring.dll ;extension=php_mcrypt.dll ;extension=php_mhash.dll ;extension=php_mime_magic.dll ;extension=php_ming.dll -;extension=php_mssql.dll ;extension=php_msql.dll +;extension=php_mssql.dll ;extension=php_mysql.dll +;extension=php_mysqli.dll ;extension=php_oci8.dll ;extension=php_openssl.dll -;extension=php_oracle.dll +;extension=php_pdo.dll +;extension=php_pdo_firebird.dll +;extension=php_pdo_mssql.dll +;extension=php_pdo_mysql.dll +;extension=php_pdo_oci.dll +;extension=php_pdo_oci8.dll +;extension=php_pdo_odbc.dll +;extension=php_pdo_pgsql.dll +;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll +;extension=php_pspell.dll ;extension=php_shmop.dll ;extension=php_snmp.dll +;extension=php_soap.dll
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard basic_functions.c
edink Sun Dec 10 01:23:41 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard basic_functions.c
Log:
Fixed by #39751 by KevinJohnHoffman at gmail dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.33r2=1.725.2.31.2.34diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.33
php-src/ext/standard/basic_functions.c:1.725.2.31.2.34
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.33 Sat Dec 9
18:00:52 2006
+++ php-src/ext/standard/basic_functions.c Sun Dec 10 01:23:41 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.33 2006/12/09 18:00:52 bjori Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.34 2006/12/10 01:23:41 edink Exp $ */
#include php.h
#include php_streams.h
@@ -3837,6 +3837,9 @@
SetEnvironmentVariable(pe-key, bugbug);
#endif
putenv(pe-previous_value);
+# if defined(PHP_WIN32)
+ efree(pe-previous_value);
+# endif
} else {
# if HAVE_UNSETENV
unsetenv(pe-key);
@@ -4430,7 +4433,12 @@
pe.previous_value = NULL;
for (env = environ; env != NULL *env != NULL; env++) {
if (!strncmp(*env, pe.key, pe.key_len)
(*env)[pe.key_len] == '=') { /* found it */
+#if defined(PHP_WIN32)
+ /* must copy previous value because MSVCRT's
putenv can free the string without notice */
+ pe.previous_value = estrndup(*env, 1024);
+#else
pe.previous_value = *env;
+#endif
break;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
edink Sun Dec 10 01:24:13 2006 UTC
Modified files:
/php-src/ext/standard basic_functions.c
Log:
MFB: Fixed by #39751 by KevinJohnHoffman at gmail dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.830r2=1.831diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.830
php-src/ext/standard/basic_functions.c:1.831
--- php-src/ext/standard/basic_functions.c:1.830Wed Dec 6 17:42:47 2006
+++ php-src/ext/standard/basic_functions.c Sun Dec 10 01:24:13 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.830 2006/12/06 17:42:47 tony2001 Exp $ */
+/* $Id: basic_functions.c,v 1.831 2006/12/10 01:24:13 edink Exp $ */
#include php.h
#include php_streams.h
@@ -3852,6 +3852,9 @@
SetEnvironmentVariable(pe-key, bugbug);
#endif
putenv(pe-previous_value);
+# if defined(PHP_WIN32)
+ efree(pe-previous_value);
+# endif
} else {
# if HAVE_UNSETENV
unsetenv(pe-key);
@@ -4419,7 +4422,12 @@
pe.previous_value = NULL;
for (env = environ; env != NULL *env != NULL; env++) {
if (!strncmp(*env, pe.key, pe.key_len)
(*env)[pe.key_len] == '=') { /* found it */
+#if defined(PHP_WIN32)
+ /* must copy previous value because MSVCRT's
putenv can free the string without notice */
+ pe.previous_value = estrndup(*env, 1024);
+#else
pe.previous_value = *env;
+#endif
break;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
edink Sun Dec 10 01:26:51 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.418r2=1.2027.2.547.2.419diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.418 php-src/NEWS:1.2027.2.547.2.419 --- php-src/NEWS:1.2027.2.547.2.418 Sat Dec 9 18:00:51 2006 +++ php-src/NEWSSun Dec 10 01:26:51 2006 @@ -57,6 +57,7 @@ sets in pdo_mysql). (Ilia) - Fixed bug #39754 (Some POSIX extension functions not thread safe). (Ilia, wharmby at uk dot ibm dot com) +- Fixed bug #39751 (putenv crash on Windows). (KevinJohnHoffman at gmail.com) - Fixed bug #39732 (oci_bind_array_by_name doesn't work on Solaris 64bit). (Tony) - Fixed bug #39724 (Broken build due to spl/filter usage of pcre extension). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl config.w32
edink Tue Nov 14 19:57:13 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl config.w32
Log:
Tell linker that we're using stati libcurl
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.3.4.1.2.1r2=1.3.4.1.2.2diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.3.4.1.2.1
php-src/ext/curl/config.w32:1.3.4.1.2.2
--- php-src/ext/curl/config.w32:1.3.4.1.2.1 Sat Sep 9 20:04:50 2006
+++ php-src/ext/curl/config.w32 Tue Nov 14 19:57:13 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.3.4.1.2.1 2006/09/09 20:04:50 bjori Exp $
+// $Id: config.w32,v 1.3.4.1.2.2 2006/11/14 19:57:13 edink Exp $
// vim:ft=javascript
ARG_WITH(curl, cURL support, no);
@@ -13,6 +13,7 @@
EXTENSION(curl, interface.c multi.c streams.c);
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in cURL');
+ ADD_FLAG(CFLAGS_CURL, /D CURL_STATICLIB);
// TODO: check for curl_version_info
// AC_DEFINE('PHP_CURL_URL_WRAPPERS', 0, 'Use curl for URL
wrappers [experimental]');
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl config.w32
edink Tue Nov 14 19:57:35 2006 UTC
Modified files:
/php-src/ext/curl config.w32
Log:
MFB: Tell linker that we're using stati libcurl
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.5 php-src/ext/curl/config.w32:1.6
--- php-src/ext/curl/config.w32:1.5 Sat Sep 9 20:03:55 2006
+++ php-src/ext/curl/config.w32 Tue Nov 14 19:57:35 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.5 2006/09/09 20:03:55 bjori Exp $
+// $Id: config.w32,v 1.6 2006/11/14 19:57:35 edink Exp $
// vim:ft=javascript
ARG_WITH(curl, cURL support, no);
@@ -13,6 +13,7 @@
EXTENSION(curl, interface.c multi.c streams.c);
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in cURL');
+ ADD_FLAG(CFLAGS_CURL, /D CURL_STATICLIB);
// TODO: check for curl_version_info
// AC_DEFINE('PHP_CURL_URL_WRAPPERS', 0, 'Use curl for URL
wrappers [experimental]');
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
edink Tue Nov 14 19:59:32 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Bundled lib upgrade http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.361r2=1.2027.2.547.2.362diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.361 php-src/NEWS:1.2027.2.547.2.362 --- php-src/NEWS:1.2027.2.547.2.361 Tue Nov 14 10:31:47 2006 +++ php-src/NEWSTue Nov 14 19:59:31 2006 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? ??? 2007, PHP 5.2.1 +- Updated bundled libcURL to version 7.16.0 in the Windows distro. (Edin) - cgi.* and fastcgi.* directives are moved to INI subsystem. The new directive cgi.check_shebang_line can be used to ommiting checnk for #! /usr/bin/php line. (Dmitry). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_pgsql config.w32 /ext/pgsql config.w32
edink Wed Oct 11 11:00:03 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pgsql config.w32
/php-src/ext/pdo_pgsql config.w32
Log:
Sync with Unix build
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/config.w32?r1=1.7.4.2r2=1.7.4.3diff_format=u
Index: php-src/ext/pgsql/config.w32
diff -u php-src/ext/pgsql/config.w32:1.7.4.2
php-src/ext/pgsql/config.w32:1.7.4.3
--- php-src/ext/pgsql/config.w32:1.7.4.2Thu Oct 5 11:13:31 2006
+++ php-src/ext/pgsql/config.w32Wed Oct 11 11:00:02 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7.4.2 2006/10/05 11:13:31 edink Exp $
+// $Id: config.w32,v 1.7.4.3 2006/10/11 11:00:02 edink Exp $
// vim:ft=javascript
ARG_WITH(pgsql, PostgreSQL support, no);
@@ -8,7 +8,7 @@
CHECK_HEADER_ADD_INCLUDE(libpq-fe.h, CFLAGS_PGSQL,
PHP_PGSQL + \\include; + PHP_PHP_BUILD + \\include\\pgsql; + PHP_PGSQL)) {
EXTENSION(pgsql, pgsql.c);
AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library');
- ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS
/D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D
HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS /D
HAVE_PQEXECPARAMS /D HAVE_PQPREPARE /D HAVE_PQEXECPREPARED /D
HAVE_PQRESULTERRORFIELD /D HAVE_PQSENDQUERYPARAMS /D HAVE_PQSENDPREPARE /D
HAVE_PQSENDQUERYPREPARED /D HAVE_PQPUTCOPYDATA /D HAVE_PQPUTCOPYEND /D
HAVE_PQGETCOPYDATA /D HAVE_PQSETERRORVERBOSITY /D HAVE_PQUNESCAPEBYTEA /D
HAVE_PQFTABLE /D HAVE_PQESCAPE_CONN);
+ ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS
/D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D
HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS /D
HAVE_PQEXECPARAMS /D HAVE_PQPREPARE /D HAVE_PQEXECPREPARED /D
HAVE_PQRESULTERRORFIELD /D HAVE_PQSENDQUERYPARAMS /D HAVE_PQSENDPREPARE /D
HAVE_PQSENDQUERYPREPARED /D HAVE_PQPUTCOPYDATA /D HAVE_PQPUTCOPYEND /D
HAVE_PQGETCOPYDATA /D HAVE_PQSETERRORVERBOSITY /D HAVE_PQUNESCAPEBYTEA /D
HAVE_PQFTABLE /D HAVE_PQESCAPE_CONN /D HAVE_PQESCAPE_BYTEA_CONN);
} else {
WARNING(pgsql not enabled; libraries and headers not found);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.w32?r1=1.4.2.1.2.2r2=1.4.2.1.2.3diff_format=u
Index: php-src/ext/pdo_pgsql/config.w32
diff -u php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.2
php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.3
--- php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.2Thu Oct 5 11:13:31 2006
+++ php-src/ext/pdo_pgsql/config.w32Wed Oct 11 11:00:03 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.2.1.2.2 2006/10/05 11:13:31 edink Exp $
+// $Id: config.w32,v 1.4.2.1.2.3 2006/10/11 11:00:03 edink Exp $
// vim:ft=javascript
ARG_WITH(pdo-pgsql, PostgreSQL support for PDO, no);
@@ -13,7 +13,7 @@
}
AC_DEFINE('HAVE_PDO_PGSQL', 1, 'Have PostgreSQL library');
- ADD_FLAG('CFLAGS_PDO_PGSQL', /D HAVE_PQPARAMETERSTATUS=1 /D
HAVE_PQPROTOCOLVERSION=1 /D HAVE_PGTRANSACTIONSTATUS=1 /D
HAVE_PQUNESCAPEBYTEA=1 /D HAVE_PQRESULTERRORFIELD=1 /D HAVE_PQESCAPE_CONN=1);
+ ADD_FLAG('CFLAGS_PDO_PGSQL', /D HAVE_PQPARAMETERSTATUS=1 /D
HAVE_PQPROTOCOLVERSION=1 /D HAVE_PGTRANSACTIONSTATUS=1 /D
HAVE_PQUNESCAPEBYTEA=1 /D HAVE_PQRESULTERRORFIELD=1 /D HAVE_PQESCAPE_CONN=1 /D
HAVE_PQESCAPE_BYTEA_CONN=1);
} else {
WARNING(pdo_pgsql not enabled; libraries and headers not
found);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_pgsql config.w32 /ext/pgsql config.w32
edink Wed Oct 11 11:00:37 2006 UTC
Modified files:
/php-src/ext/pgsql config.w32
/php-src/ext/pdo_pgsql config.w32
Log:
MFB: Sync with Unix build
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/config.w32?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/pgsql/config.w32
diff -u php-src/ext/pgsql/config.w32:1.9 php-src/ext/pgsql/config.w32:1.10
--- php-src/ext/pgsql/config.w32:1.9Thu Oct 5 11:14:17 2006
+++ php-src/ext/pgsql/config.w32Wed Oct 11 11:00:37 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.9 2006/10/05 11:14:17 edink Exp $
+// $Id: config.w32,v 1.10 2006/10/11 11:00:37 edink Exp $
// vim:ft=javascript
ARG_WITH(pgsql, PostgreSQL support, no);
@@ -8,7 +8,7 @@
CHECK_HEADER_ADD_INCLUDE(libpq-fe.h, CFLAGS_PGSQL,
PHP_PGSQL + \\include; + PHP_PHP_BUILD + \\include\\pgsql; + PHP_PGSQL)) {
EXTENSION(pgsql, pgsql.c);
AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library');
- ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS
/D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D
HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS /D
HAVE_PQEXECPARAMS /D HAVE_PQPREPARE /D HAVE_PQEXECPREPARED /D
HAVE_PQRESULTERRORFIELD /D HAVE_PQSENDQUERYPARAMS /D HAVE_PQSENDPREPARE /D
HAVE_PQSENDQUERYPREPARED /D HAVE_PQPUTCOPYDATA /D HAVE_PQPUTCOPYEND /D
HAVE_PQGETCOPYDATA /D HAVE_PQSETERRORVERBOSITY /D HAVE_PQUNESCAPEBYTEA /D
HAVE_PQFTABLE /D HAVE_PQESCAPE_CONN);
+ ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS
/D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D
HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS /D
HAVE_PQEXECPARAMS /D HAVE_PQPREPARE /D HAVE_PQEXECPREPARED /D
HAVE_PQRESULTERRORFIELD /D HAVE_PQSENDQUERYPARAMS /D HAVE_PQSENDPREPARE /D
HAVE_PQSENDQUERYPREPARED /D HAVE_PQPUTCOPYDATA /D HAVE_PQPUTCOPYEND /D
HAVE_PQGETCOPYDATA /D HAVE_PQSETERRORVERBOSITY /D HAVE_PQUNESCAPEBYTEA /D
HAVE_PQFTABLE /D HAVE_PQESCAPE_CONN /D HAVE_PQESCAPE_BYTEA_CONN);
} else {
WARNING(pgsql not enabled; libraries and headers not found);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.w32?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/pdo_pgsql/config.w32
diff -u php-src/ext/pdo_pgsql/config.w32:1.7
php-src/ext/pdo_pgsql/config.w32:1.8
--- php-src/ext/pdo_pgsql/config.w32:1.7Thu Oct 5 11:14:17 2006
+++ php-src/ext/pdo_pgsql/config.w32Wed Oct 11 11:00:37 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7 2006/10/05 11:14:17 edink Exp $
+// $Id: config.w32,v 1.8 2006/10/11 11:00:37 edink Exp $
// vim:ft=javascript
ARG_WITH(pdo-pgsql, PostgreSQL support for PDO, no);
@@ -13,7 +13,7 @@
}
AC_DEFINE('HAVE_PDO_PGSQL', 1, 'Have PostgreSQL library');
- ADD_FLAG('CFLAGS_PDO_PGSQL', /D HAVE_PQPARAMETERSTATUS=1 /D
HAVE_PQPROTOCOLVERSION=1 /D HAVE_PGTRANSACTIONSTATUS=1 /D
HAVE_PQUNESCAPEBYTEA=1 /D HAVE_PQRESULTERRORFIELD=1 /D HAVE_PQESCAPE_CONN=1);
+ ADD_FLAG('CFLAGS_PDO_PGSQL', /D HAVE_PQPARAMETERSTATUS=1 /D
HAVE_PQPROTOCOLVERSION=1 /D HAVE_PGTRANSACTIONSTATUS=1 /D
HAVE_PQUNESCAPEBYTEA=1 /D HAVE_PQRESULTERRORFIELD=1 /D HAVE_PQESCAPE_CONN=1 /D
HAVE_PQESCAPE_BYTEA_CONN=1);
} else {
WARNING(pdo_pgsql not enabled; libraries and headers not
found);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard type.c
According to U_STRING_DECL documentation the second arg can only be a
string literal, so I guess coding for undocumented behavior is not
should be avoided on all platforms.
Edin
Sara Golemon wrote:
pollita Sun Oct 8 18:00:44 2006 UTC
Modified files:
/php-src/ext/standard type.c
Log:
Fix win32 (again), just temporarily convert the classname to ascii on this
platform...
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/type.c?r1=1.46r2=1.47diff_format=u
Index: php-src/ext/standard/type.c
diff -u php-src/ext/standard/type.c:1.46 php-src/ext/standard/type.c:1.47
--- php-src/ext/standard/type.c:1.46Sat Oct 7 04:45:42 2006
+++ php-src/ext/standard/type.c Sun Oct 8 18:00:44 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: type.c,v 1.46 2006/10/07 04:45:42 pollita Exp $ */
+/* $Id: type.c,v 1.47 2006/10/08 18:00:44 pollita Exp $ */
#include php.h
#include php_incomplete_class.h
@@ -238,12 +238,25 @@
/* We can get away with this because
INCOMPLETE_CLASS is ascii and has a 1:1 relationship with unicode */
RETURN_TRUE;
} else if (UG(unicode)) {
+#ifndef PHP_WIN32
U_STRING_DECL(uIncompleteClass,
(INCOMPLETE_CLASS), sizeof(INCOMPLETE_CLASS) - 1);
U_STRING_INIT(uIncompleteClass,
(INCOMPLETE_CLASS), sizeof(INCOMPLETE_CLASS) - 1);
if (!memcmp(ce-name.u, uIncompleteClass, UBYTES(sizeof(INCOMPLETE_CLASS {
RETURN_FALSE;
}
+#else /* WIN32 -- U_STRING_DECL breaks under Win32 with string macros */
+ char *ascii_name =
zend_unicode_to_ascii(ce-name.u, ce-name_length TSRSMLS_CC);
+
+ if (ascii_name) {
+ if (memcmp(INCOMPLETE_CLASS,
ascii_name, sizeof(INCOMPLETE_CLASS) - 1) == 0) {
+ efree(ascii_name);
+ RETURN_FALSE;
+ }
+ efree(ascii_name);
+ }
+ /* Non-ascii class name means it can't be
INCOMPLETE_CLASS and is therefore okay */
+#endif
} else {
if (!memcmp(ce-name.s, INCOMPLETE_CLASS,
sizeof(INCOMPLETE_CLASS))) {
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/com_dotnet com_handlers.c
edink Fri Oct 6 12:23:30 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/com_dotnet com_handlers.c Log: Fix for #38985 (Wez) http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_handlers.c?r1=1.30.2.5.2.1r2=1.30.2.5.2.2diff_format=u Index: php-src/ext/com_dotnet/com_handlers.c diff -u php-src/ext/com_dotnet/com_handlers.c:1.30.2.5.2.1 php-src/ext/com_dotnet/com_handlers.c:1.30.2.5.2.2 --- php-src/ext/com_dotnet/com_handlers.c:1.30.2.5.2.1 Wed May 10 14:39:10 2006 +++ php-src/ext/com_dotnet/com_handlers.c Fri Oct 6 12:23:30 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: com_handlers.c,v 1.30.2.5.2.1 2006/05/10 14:39:10 rrichards Exp $ */ +/* $Id: com_handlers.c,v 1.30.2.5.2.2 2006/10/06 12:23:30 edink Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -537,7 +537,7 @@ return SUCCESS; } - return FAILURE; + return zend_std_cast_object_tostring(readobj, writeobj, type TSRMLS_CC); } static int com_object_count(zval *object, long *count TSRMLS_DC) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
edink Fri Oct 6 12:53:15 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.290r2=1.2027.2.547.2.291diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.290 php-src/NEWS:1.2027.2.547.2.291 --- php-src/NEWS:1.2027.2.547.2.290 Thu Oct 5 19:49:03 2006 +++ php-src/NEWSFri Oct 6 12:53:15 2006 @@ -31,6 +31,7 @@ session.save_path, allowing them to account for extra parameters). (Ilia) - Fixed bug #38989 (Absolute path with slash at beginning doesn't work on win). (Dmitry) +- Fixed bug #38985 (Can't cast COM objects). (Wez) - Fixed bug #38981 (using FTP URLs in get_headers() causes crash). (Tony) - Fixed bug #38961 (metaphone() results in segmentation fault on NetBSD). (Tony) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_pgsql config.w32 /ext/pgsql config.w32
edink Thu Oct 5 11:13:31 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_pgsql config.w32
/php-src/ext/pgsql config.w32
Log:
Added PQescapeStringConn support to windows too
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.w32?r1=1.4.2.1.2.1r2=1.4.2.1.2.2diff_format=u
Index: php-src/ext/pdo_pgsql/config.w32
diff -u php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.1
php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.2
--- php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.1Thu May 11 21:43:59 2006
+++ php-src/ext/pdo_pgsql/config.w32Thu Oct 5 11:13:31 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.2.1.2.1 2006/05/11 21:43:59 edink Exp $
+// $Id: config.w32,v 1.4.2.1.2.2 2006/10/05 11:13:31 edink Exp $
// vim:ft=javascript
ARG_WITH(pdo-pgsql, PostgreSQL support for PDO, no);
@@ -13,7 +13,7 @@
}
AC_DEFINE('HAVE_PDO_PGSQL', 1, 'Have PostgreSQL library');
- ADD_FLAG('CFLAGS_PDO_PGSQL', /D HAVE_PQPARAMETERSTATUS=1 /D
HAVE_PQPROTOCOLVERSION=1 /D HAVE_PGTRANSACTIONSTATUS=1 /D
HAVE_PQUNESCAPEBYTEA=1 /D HAVE_PQRESULTERRORFIELD=1);
+ ADD_FLAG('CFLAGS_PDO_PGSQL', /D HAVE_PQPARAMETERSTATUS=1 /D
HAVE_PQPROTOCOLVERSION=1 /D HAVE_PGTRANSACTIONSTATUS=1 /D
HAVE_PQUNESCAPEBYTEA=1 /D HAVE_PQRESULTERRORFIELD=1 /D HAVE_PQESCAPE_CONN=1);
} else {
WARNING(pdo_pgsql not enabled; libraries and headers not
found);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/config.w32?r1=1.7.4.1r2=1.7.4.2diff_format=u
Index: php-src/ext/pgsql/config.w32
diff -u php-src/ext/pgsql/config.w32:1.7.4.1
php-src/ext/pgsql/config.w32:1.7.4.2
--- php-src/ext/pgsql/config.w32:1.7.4.1Fri Sep 15 19:47:50 2006
+++ php-src/ext/pgsql/config.w32Thu Oct 5 11:13:31 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7.4.1 2006/09/15 19:47:50 iliaa Exp $
+// $Id: config.w32,v 1.7.4.2 2006/10/05 11:13:31 edink Exp $
// vim:ft=javascript
ARG_WITH(pgsql, PostgreSQL support, no);
@@ -8,7 +8,7 @@
CHECK_HEADER_ADD_INCLUDE(libpq-fe.h, CFLAGS_PGSQL,
PHP_PGSQL + \\include; + PHP_PHP_BUILD + \\include\\pgsql; + PHP_PGSQL)) {
EXTENSION(pgsql, pgsql.c);
AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library');
- ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS
/D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D
HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS /D
HAVE_PQEXECPARAMS /D HAVE_PQPREPARE /D HAVE_PQEXECPREPARED /D
HAVE_PQRESULTERRORFIELD /D HAVE_PQSENDQUERYPARAMS /D HAVE_PQSENDPREPARE /D
HAVE_PQSENDQUERYPREPARED /D HAVE_PQPUTCOPYDATA /D HAVE_PQPUTCOPYEND /D
HAVE_PQGETCOPYDATA /D HAVE_PQSETERRORVERBOSITY /D HAVE_PQUNESCAPEBYTEA /D
HAVE_PQFTABLE);
+ ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS
/D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D
HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS /D
HAVE_PQEXECPARAMS /D HAVE_PQPREPARE /D HAVE_PQEXECPREPARED /D
HAVE_PQRESULTERRORFIELD /D HAVE_PQSENDQUERYPARAMS /D HAVE_PQSENDPREPARE /D
HAVE_PQSENDQUERYPREPARED /D HAVE_PQPUTCOPYDATA /D HAVE_PQPUTCOPYEND /D
HAVE_PQGETCOPYDATA /D HAVE_PQSETERRORVERBOSITY /D HAVE_PQUNESCAPEBYTEA /D
HAVE_PQFTABLE /D HAVE_PQESCAPE_CONN);
} else {
WARNING(pgsql not enabled; libraries and headers not found);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_pgsql config.w32 /ext/pgsql config.w32
edink Thu Oct 5 11:14:17 2006 UTC
Modified files:
/php-src/ext/pdo_pgsql config.w32
/php-src/ext/pgsql config.w32
Log:
MFB: Added PQescapeStringConn support to windows too
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.w32?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/pdo_pgsql/config.w32
diff -u php-src/ext/pdo_pgsql/config.w32:1.6
php-src/ext/pdo_pgsql/config.w32:1.7
--- php-src/ext/pdo_pgsql/config.w32:1.6Thu May 11 21:48:57 2006
+++ php-src/ext/pdo_pgsql/config.w32Thu Oct 5 11:14:17 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6 2006/05/11 21:48:57 edink Exp $
+// $Id: config.w32,v 1.7 2006/10/05 11:14:17 edink Exp $
// vim:ft=javascript
ARG_WITH(pdo-pgsql, PostgreSQL support for PDO, no);
@@ -13,7 +13,7 @@
}
AC_DEFINE('HAVE_PDO_PGSQL', 1, 'Have PostgreSQL library');
- ADD_FLAG('CFLAGS_PDO_PGSQL', /D HAVE_PQPARAMETERSTATUS=1 /D
HAVE_PQPROTOCOLVERSION=1 /D HAVE_PGTRANSACTIONSTATUS=1 /D
HAVE_PQUNESCAPEBYTEA=1 /D HAVE_PQRESULTERRORFIELD=1);
+ ADD_FLAG('CFLAGS_PDO_PGSQL', /D HAVE_PQPARAMETERSTATUS=1 /D
HAVE_PQPROTOCOLVERSION=1 /D HAVE_PGTRANSACTIONSTATUS=1 /D
HAVE_PQUNESCAPEBYTEA=1 /D HAVE_PQRESULTERRORFIELD=1 /D HAVE_PQESCAPE_CONN=1);
} else {
WARNING(pdo_pgsql not enabled; libraries and headers not
found);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/config.w32?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/pgsql/config.w32
diff -u php-src/ext/pgsql/config.w32:1.8 php-src/ext/pgsql/config.w32:1.9
--- php-src/ext/pgsql/config.w32:1.8Fri Sep 15 19:48:55 2006
+++ php-src/ext/pgsql/config.w32Thu Oct 5 11:14:17 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.8 2006/09/15 19:48:55 iliaa Exp $
+// $Id: config.w32,v 1.9 2006/10/05 11:14:17 edink Exp $
// vim:ft=javascript
ARG_WITH(pgsql, PostgreSQL support, no);
@@ -8,7 +8,7 @@
CHECK_HEADER_ADD_INCLUDE(libpq-fe.h, CFLAGS_PGSQL,
PHP_PGSQL + \\include; + PHP_PHP_BUILD + \\include\\pgsql; + PHP_PGSQL)) {
EXTENSION(pgsql, pgsql.c);
AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library');
- ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS
/D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D
HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS /D
HAVE_PQEXECPARAMS /D HAVE_PQPREPARE /D HAVE_PQEXECPREPARED /D
HAVE_PQRESULTERRORFIELD /D HAVE_PQSENDQUERYPARAMS /D HAVE_PQSENDPREPARE /D
HAVE_PQSENDQUERYPREPARED /D HAVE_PQPUTCOPYDATA /D HAVE_PQPUTCOPYEND /D
HAVE_PQGETCOPYDATA /D HAVE_PQSETERRORVERBOSITY /D HAVE_PQUNESCAPEBYTEA /D
HAVE_PQFTABLE);
+ ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS
/D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D
HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS /D
HAVE_PQEXECPARAMS /D HAVE_PQPREPARE /D HAVE_PQEXECPREPARED /D
HAVE_PQRESULTERRORFIELD /D HAVE_PQSENDQUERYPARAMS /D HAVE_PQSENDPREPARE /D
HAVE_PQSENDQUERYPREPARED /D HAVE_PQPUTCOPYDATA /D HAVE_PQPUTCOPYEND /D
HAVE_PQGETCOPYDATA /D HAVE_PQSETERRORVERBOSITY /D HAVE_PQUNESCAPEBYTEA /D
HAVE_PQFTABLE /D HAVE_PQESCAPE_CONN);
} else {
WARNING(pgsql not enabled; libraries and headers not found);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
edink Thu Oct 5 11:17:56 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Library updates http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.288r2=1.2027.2.547.2.289diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.288 php-src/NEWS:1.2027.2.547.2.289 --- php-src/NEWS:1.2027.2.547.2.288 Thu Oct 5 08:03:11 2006 +++ php-src/NEWSThu Oct 5 11:17:56 2006 @@ -1,6 +1,8 @@ PHPNEWS ||| ?? Sep 2006, PHP 5.2.0 +- Updated bundled OpenSSL to version 0.9.8d in the Windows distro. (Edin) +- Updated Postgresql client libraries to 8.1.4 in the Windows distro. (Edin) - Speedup array/HashTable copying. (Matt W, Dmitry) - Added ability to make SOAP call userspace PHP-XML converters. (Dmitry) - Added support for character sets in pg_escape_string() for PostgreSQL -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard credits_ext.h
edink Wed Oct 4 12:51:33 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard credits_ext.h Log: Update credits http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits_ext.h?r1=1.30.2.6.2.3r2=1.30.2.6.2.4diff_format=u Index: php-src/ext/standard/credits_ext.h diff -u php-src/ext/standard/credits_ext.h:1.30.2.6.2.3 php-src/ext/standard/credits_ext.h:1.30.2.6.2.4 --- php-src/ext/standard/credits_ext.h:1.30.2.6.2.3 Thu Aug 31 22:52:54 2006 +++ php-src/ext/standard/credits_ext.h Wed Oct 4 12:51:33 2006 @@ -33,7 +33,7 @@ CREDIT_LINE(Iconv, Rui Hirokawa, Stig Bakken, Moriyoshi Koizumi ); CREDIT_LINE(IMAP, Rex Logan, Mark Musone, Brian Wang, Kaj-Michael Lang, Antoni Pamies Olive, Rasmus Lerdorf, Andrew Skalski, Chuck Hagenbuch, Daniel R Kalowsky); CREDIT_LINE(Informix, Danny Heijl, Christian Cartus, Corne' Cornelius); -CREDIT_LINE(Input Filter, Rasmus Lerdorf, Derick Rethans, Pierre-Alain Joye); +CREDIT_LINE(Input Filter, Rasmus Lerdorf, Derick Rethans, Pierre-Alain Joye, Ilia Alshanetsky); CREDIT_LINE(InterBase, Jouni Ahto, Andrew Avdeev, Ard Biesheuvel); CREDIT_LINE(JSON, Omar Kilani); CREDIT_LINE(LDAP, Amitay Isaacs, Eric Warnke, Rasmus Lerdorf, Gerrit Thomson, Stig Venaas); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard credits_ext.h
edink Wed Oct 4 12:53:03 2006 UTC Modified files: /php-src/ext/standard credits_ext.h Log: Update credits http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits_ext.h?r1=1.38r2=1.39diff_format=u Index: php-src/ext/standard/credits_ext.h diff -u php-src/ext/standard/credits_ext.h:1.38 php-src/ext/standard/credits_ext.h:1.39 --- php-src/ext/standard/credits_ext.h:1.38 Thu Aug 31 22:52:29 2006 +++ php-src/ext/standard/credits_ext.h Wed Oct 4 12:53:03 2006 @@ -33,7 +33,7 @@ CREDIT_LINE(Iconv, Rui Hirokawa, Stig Bakken, Moriyoshi Koizumi ); CREDIT_LINE(IMAP, Rex Logan, Mark Musone, Brian Wang, Kaj-Michael Lang, Antoni Pamies Olive, Rasmus Lerdorf, Andrew Skalski, Chuck Hagenbuch, Daniel R Kalowsky); CREDIT_LINE(Informix, Danny Heijl, Christian Cartus, Corne' Cornelius); -CREDIT_LINE(Input Filter, Rasmus Lerdorf, Derick Rethans, Pierre-Alain Joye); +CREDIT_LINE(Input Filter, Rasmus Lerdorf, Derick Rethans, Pierre-Alain Joye, Ilia Alshanetsky); CREDIT_LINE(InterBase, Jouni Ahto, Andrew Avdeev, Ard Biesheuvel); CREDIT_LINE(JSON, Omar Kilani); CREDIT_LINE(LDAP, Amitay Isaacs, Eric Warnke, Rasmus Lerdorf, Gerrit Thomson, Stig Venaas); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/libxml libxml.c
edink Wed Sep 6 21:44:45 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/libxml libxml.c
Log:
Fixed bug #38190 (threading issues on windows 2003)
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.7r2=1.32.2.7.2.8diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.7
php-src/ext/libxml/libxml.c:1.32.2.7.2.8
--- php-src/ext/libxml/libxml.c:1.32.2.7.2.7Tue Sep 5 12:39:20 2006
+++ php-src/ext/libxml/libxml.c Wed Sep 6 21:44:45 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.32.2.7.2.7 2006/09/05 12:39:20 nlopess Exp $ */
+/* $Id: libxml.c,v 1.32.2.7.2.8 2006/09/06 21:44:45 edink Exp $ */
#define IS_EXT_MODULE
@@ -1033,6 +1033,13 @@
}
/* }}} */
+#ifdef PHP_WIN32
+PHP_LIBXML_API BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID
lpvReserved)
+{
+ return xmlDllMain(hinstDLL, fdwReason, lpvReserved);
+}
+#endif
+
#endif
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml libxml.c
edink Wed Sep 6 21:48:57 2006 UTC
Modified files:
/php-src/ext/libxml libxml.c
Log:
MFB: Fixed bug #38190 (threading issues on windows 2003)
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.52r2=1.53diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.52 php-src/ext/libxml/libxml.c:1.53
--- php-src/ext/libxml/libxml.c:1.52Tue Sep 5 12:42:25 2006
+++ php-src/ext/libxml/libxml.c Wed Sep 6 21:48:57 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.52 2006/09/05 12:42:25 nlopess Exp $ */
+/* $Id: libxml.c,v 1.53 2006/09/06 21:48:57 edink Exp $ */
#define IS_EXT_MODULE
@@ -1043,6 +1043,13 @@
}
/* }}} */
+#ifdef PHP_WIN32
+PHP_LIBXML_API BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID
lpvReserved)
+{
+ return xmlDllMain(hinstDLL, fdwReason, lpvReserved);
+}
+#endif
+
#endif
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/domxml php_domxml.c
edink Wed Sep 6 22:08:04 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/domxml php_domxml.c
Log:
Slightly different definiton for php4
http://cvs.php.net/viewvc.cgi/php-src/ext/domxml/php_domxml.c?r1=1.218.2.50.2.3r2=1.218.2.50.2.4diff_format=u
Index: php-src/ext/domxml/php_domxml.c
diff -u php-src/ext/domxml/php_domxml.c:1.218.2.50.2.3
php-src/ext/domxml/php_domxml.c:1.218.2.50.2.4
--- php-src/ext/domxml/php_domxml.c:1.218.2.50.2.3 Wed Sep 6 21:55:26 2006
+++ php-src/ext/domxml/php_domxml.c Wed Sep 6 22:08:04 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_domxml.c,v 1.218.2.50.2.3 2006/09/06 21:55:26 edink Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.50.2.4 2006/09/06 22:08:04 edink Exp $ */
/* TODO
* - Support Notation Nodes
@@ -5521,7 +5521,7 @@
#endif /* HAVE_DOMXSLT */
#ifdef PHP_WIN32
-PHP_LIBXML_API BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID
lpvReserved)
+__declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
LPVOID lpvReserved)
{
return xmlDllMain(hinstDLL, fdwReason, lpvReserved);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main php_ini.c
edink Tue Sep 5 11:54:15 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main php_ini.c
Log:
Search for php.ini in CWD in all sapi's *but* CLI.
This patch reverses wrong behavaiour introduced before the
release of 5.1.0.
# We should probably consider killing adding CWD php.ini lookup
# altogether.
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4.2.2r2=1.136.2.4.2.3diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.4.2.2
php-src/main/php_ini.c:1.136.2.4.2.3
--- php-src/main/php_ini.c:1.136.2.4.2.2Thu Aug 3 11:04:52 2006
+++ php-src/main/php_ini.c Tue Sep 5 11:54:15 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.136.2.4.2.2 2006/08/03 11:04:52 dmitry Exp $ */
+/* $Id: php_ini.c,v 1.136.2.4.2.3 2006/09/05 11:54:15 edink Exp $ */
#include php.h
#include ext/standard/info.h
@@ -333,8 +333,8 @@
}
#endif
- /* Add cwd (only with CLI) */
- if (strcmp(sapi_module.name, cli) == 0) {
+ /* Add cwd (not with CLI) */
+ if (strcmp(sapi_module.name, cli) != 0) {
if (*php_ini_search_path) {
strcat(php_ini_search_path, paths_separator);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_ini.c
edink Tue Sep 5 11:55:08 2006 UTC
Modified files:
/php-src/main php_ini.c
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.144r2=1.145diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.144 php-src/main/php_ini.c:1.145
--- php-src/main/php_ini.c:1.144Thu Aug 3 11:05:09 2006
+++ php-src/main/php_ini.c Tue Sep 5 11:55:08 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.144 2006/08/03 11:05:09 dmitry Exp $ */
+/* $Id: php_ini.c,v 1.145 2006/09/05 11:55:08 edink Exp $ */
#include php.h
#include ext/standard/info.h
@@ -331,8 +331,8 @@
}
#endif
- /* Add cwd (only with CLI) */
- if (strcmp(sapi_module.name, cli) == 0) {
+ /* Add cwd (not with CLI) */
+ if (strcmp(sapi_module.name, cli) != 0) {
if (*php_ini_search_path) {
strcat(php_ini_search_path, paths_separator);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
edink Tue Sep 5 11:58:05 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: CWD php.ini search news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.234r2=1.2027.2.547.2.235diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.234 php-src/NEWS:1.2027.2.547.2.235 --- php-src/NEWS:1.2027.2.547.2.234 Mon Sep 4 16:31:27 2006 +++ php-src/NEWSTue Sep 5 11:58:05 2006 @@ -1,6 +1,8 @@ 'PHP NEWS ||| ?? Sep 2006, PHP 5.2.0RC4 +- Removed current working directory from the php.ini search path for CLI and + readded it for other SAPIs (restore to pre 5.1.x behaviour). (Edin) - Fixed bug #38700 (SoapClient::__getTypes never returns). (Dmitry) - Fixed bug #38693 (curl_multi_add_handle() set curl handle to null). (Ilia) - Fixed bug #38661 (mixed-case URL breaks url-wrappers). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/installer README gen-nsis.php setini.php
edink Fri Sep 1 20:24:48 2006 UTC Removed files: /php-src/win32/installerREADME gen-nsis.php setini.php Log: Obsolete, prepaing for new installer script -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /win32/installer README gen-nsis.php setini.php
edink Fri Sep 1 20:25:32 2006 UTC Removed files: (Branch: PHP_5_2) /php-src/win32/installerREADME gen-nsis.php setini.php Log: MFH: Obsolete, prepaing for new installer script -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/com_dotnet com_typeinfo.c
edink Fri Aug 25 12:01:57 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/com_dotnet com_typeinfo.c
Log:
Fixed #37602 by olek at neurosoft dot pl
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_typeinfo.c?r1=1.7.2.1r2=1.7.2.1.2.1diff_format=u
Index: php-src/ext/com_dotnet/com_typeinfo.c
diff -u php-src/ext/com_dotnet/com_typeinfo.c:1.7.2.1
php-src/ext/com_dotnet/com_typeinfo.c:1.7.2.1.2.1
--- php-src/ext/com_dotnet/com_typeinfo.c:1.7.2.1 Sun Jan 1 12:50:00 2006
+++ php-src/ext/com_dotnet/com_typeinfo.c Fri Aug 25 12:01:57 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: com_typeinfo.c,v 1.7.2.1 2006/01/01 12:50:00 sniper Exp $ */
+/* $Id: com_typeinfo.c,v 1.7.2.1.2.1 2006/08/25 12:01:57 edink Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -220,7 +220,7 @@
/* Type-library stuff */
void php_com_typelibrary_dtor(void *pDest)
{
- ITypeLib *Lib = *(ITypeLib**)pDest;
+ ITypeLib *Lib = (ITypeLib*)pDest;
ITypeLib_Release(Lib);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/com_dotnet com_typeinfo.c
edink Fri Aug 25 12:03:31 2006 UTC
Modified files:
/php-src/ext/com_dotnet com_typeinfo.c
Log:
MFB: Fixed #37602 by olek at neurosoft dot pl
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_typeinfo.c?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/com_dotnet/com_typeinfo.c
diff -u php-src/ext/com_dotnet/com_typeinfo.c:1.9
php-src/ext/com_dotnet/com_typeinfo.c:1.10
--- php-src/ext/com_dotnet/com_typeinfo.c:1.9 Sat Apr 29 18:45:29 2006
+++ php-src/ext/com_dotnet/com_typeinfo.c Fri Aug 25 12:03:31 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: com_typeinfo.c,v 1.9 2006/04/29 18:45:29 fmk Exp $ */
+/* $Id: com_typeinfo.c,v 1.10 2006/08/25 12:03:31 edink Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -220,7 +220,7 @@
/* Type-library stuff */
void php_com_typelibrary_dtor(void *pDest)
{
- ITypeLib *Lib = *(ITypeLib**)pDest;
+ ITypeLib *Lib = (ITypeLib*)pDest;
ITypeLib_Release(Lib);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c
edink Mon Aug 14 11:59:07 2006 UTC
Modified files:
/php-src/ext/standard string.c
Log:
Fixed windows build.
Looking at the macro definition it seems that the second argument
to U_STRING_DECL can only be a string literal, not an indetifier.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.575r2=1.576diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.575 php-src/ext/standard/string.c:1.576
--- php-src/ext/standard/string.c:1.575 Thu Aug 10 19:02:32 2006
+++ php-src/ext/standard/string.c Mon Aug 14 11:59:07 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.575 2006/08/10 19:02:32 iliaa Exp $ */
+/* $Id: string.c,v 1.576 2006/08/14 11:59:07 edink Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -6777,8 +6777,9 @@
static char rot13_from[] =
abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ;
static char rot13_to[] =
nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM;
-U_STRING_DECL(u_rot13_from, rot13_from, sizeof(rot13_from)-1);
-U_STRING_DECL(u_rot13_to, rot13_to, sizeof(rot13_to)-1);
+U_STRING_DECL(u_rot13_from,
abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ, sizeof(rot13_from)-1);
+U_STRING_DECL(u_rot13_to,
nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM, sizeof(rot13_to)-1);
+
/* {{{ proto string str_rot13(string str) U
Perform the rot13 transform on a string */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
edink Thu Jul 20 22:21:27 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Lib update http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.134r2=1.2027.2.547.2.135diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.134 php-src/NEWS:1.2027.2.547.2.135 --- php-src/NEWS:1.2027.2.547.2.134 Wed Jul 19 16:20:02 2006 +++ php-src/NEWSThu Jul 20 22:21:27 2006 @@ -1,6 +1,8 @@ PHPNEWS ||| ?? ??? 2006, PHP 5.2.0 +- Updated bundled MySQL client library to version 5.0.22 in the Windows + distribution. (Edin) - Updated timezonedb to version 2006.7. (Derick) - Changed priority of PHPRC environment variable on win32 to be higher then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2filter config.w32
edink Wed Jul 5 10:12:43 2006 UTC
Added files:
/php-src/sapi/apache2filter config.w32
Log:
Added windows build support for apach2filter, supporting apache 2.0.x and
2.2.x
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.w32?view=markuprev=1.1
Index: php-src/sapi/apache2filter/config.w32
+++ php-src/sapi/apache2filter/config.w32
// vim:ft=javascript
// $Id: config.w32,v 1.1 2006/07/05 10:12:42 edink Exp $
ARG_ENABLE('apache2filter', 'Build Apache 2.x filter', 'no');
if (PHP_APACHE2FILTER != no) {
if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE2FILTER,
PHP_PHP_BUILD + \\apache2\\include)
CHECK_LIB(libhttpd.lib, apache2filter,
PHP_PHP_BUILD + \\apache2\\lib)
CHECK_LIB(libapr.lib, apache2filter, PHP_PHP_BUILD
+ \\apache2\\lib)
CHECK_LIB(libaprutil.lib, apache2filter,
PHP_PHP_BUILD + \\apache2\\lib)
) {
SAPI('apache2filter', 'sapi_apache2.c apache_config.c
php_functions.c',
'php' + PHP_VERSION + 'apache2_filter.dll',
'/D PHP_APACHE2_EXPORTS /I win32');
} else {
WARNING(Could not find apache2 filter libraries/headers);
}
}
ARG_ENABLE('apache2-2filter', 'Build Apache 2.2.x filter', 'no');
if (PHP_APACHE2_2FILTER != no) {
if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE2_2FILTER,
PHP_PHP_BUILD + \\include\\apache2_2)
CHECK_LIB(libhttpd.lib, apache2_2filter,
PHP_PHP_BUILD + \\lib\\apache2_2)
CHECK_LIB(libapr-1.lib, apache2_2filter,
PHP_PHP_BUILD + \\lib\\apache2_2)
CHECK_LIB(libaprutil-1.lib, apache2_2filter,
PHP_PHP_BUILD + \\lib\\apache2_2)
) {
SAPI('apache2_2filter', 'sapi_apache2.c apache_config.c
php_functions.c',
'php' + PHP_VERSION + 'apache2_2_filter.dll',
'/D PHP_APACHE2_EXPORTS /I win32',
'sapi\\apache2_2filter');
} else {
WARNING(Could not find apache2.2 filter libraries/headers);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
edink Wed Jul 5 10:18:26 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: apache2filter on windows news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.105r2=1.2027.2.547.2.106diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.105 php-src/NEWS:1.2027.2.547.2.106 --- php-src/NEWS:1.2027.2.547.2.105 Tue Jul 4 18:13:57 2006 +++ php-src/NEWSWed Jul 5 10:18:25 2006 @@ -3,6 +3,9 @@ ?? ??? 2006, PHP 5.2.0 - Reimplementation of Apache2Filter, PHP can now be an arbitrary filter in the chain and will read the script from the Apache stream. (John) +- Added support for Apache2Filter in the Windows build including binary + support for both Apache 2.0.x (php5apache2_filter.dll) and + Apache 2.2.x (php5apache2_2_filter.dll). (Edin) - Updated timezonedb to version 2006.7. (Derick) - Changed priority of PHPRC environment variable on win32 to be higher then value from registry. (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main/streams plain_wrapper.c
edink Mon Jun 5 22:19:36 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/main/streams plain_wrapper.c
Log:
Fixed bug #35886 (nlopes)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.75r2=1.2027.2.547.2.76diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.75 php-src/NEWS:1.2027.2.547.2.76
--- php-src/NEWS:1.2027.2.547.2.75 Mon Jun 5 09:57:17 2006
+++ php-src/NEWSMon Jun 5 22:19:36 2006
@@ -110,6 +110,8 @@
RFC3548 compliance). (Ilia)
- Fixed bug #36949 (invalid internal mysqli objects dtor). (Mike)
- Fixed bug #36630 (umask not reset at the end of the request). (Ilia)
+- Fixed bug #35886 (file_get_contents() fails with some
+ combinations of offset maxlen). (Nuno)
- Fixed bug #35512 (Lack of read permission on main script results in
E_WARNING rather then E_ERROR). (Ilia)
- Fixed bug #34180 (--with-curlwrappers causes PHP to disregard some HTTP
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.1r2=1.52.2.6.2.2diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.1
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.2
--- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.1 Tue May 16 13:05:02 2006
+++ php-src/main/streams/plain_wrapper.cMon Jun 5 22:19:36 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6.2.1 2006/05/16 13:05:02 tony2001 Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.2 2006/06/05 22:19:36 edink Exp $ */
#include php.h
#include php_globals.h
@@ -706,7 +706,7 @@
delta = range-offset -
loffs;
}
- data-last_mapped_addr =
MapViewOfFile(data-file_mapping, acc, 0, loffs, range-length);
+ data-last_mapped_addr =
MapViewOfFile(data-file_mapping, acc, 0, loffs, range-length + delta);
if (data-last_mapped_addr) {
/* give them back the
address of the start offset they requested */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams plain_wrapper.c
edink Mon Jun 5 22:23:39 2006 UTC
Modified files:
/php-src/main/streams plain_wrapper.c
Log:
MFB
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/plain_wrapper.c?r1=1.65r2=1.66diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.65
php-src/main/streams/plain_wrapper.c:1.66
--- php-src/main/streams/plain_wrapper.c:1.65 Tue May 16 13:05:23 2006
+++ php-src/main/streams/plain_wrapper.cMon Jun 5 22:23:39 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.65 2006/05/16 13:05:23 tony2001 Exp $ */
+/* $Id: plain_wrapper.c,v 1.66 2006/06/05 22:23:39 edink Exp $ */
#include php.h
#include php_globals.h
@@ -706,7 +706,7 @@
delta = range-offset -
loffs;
}
- data-last_mapped_addr =
MapViewOfFile(data-file_mapping, acc, 0, loffs, range-length);
+ data-last_mapped_addr =
MapViewOfFile(data-file_mapping, acc, 0, loffs, range-length + delta);
if (data-last_mapped_addr) {
/* give them back the
address of the start offset they requested */
@@ -963,7 +963,7 @@
if ((p = strstr(url, ://)) != NULL) {
url = p + 3;
}
-
+
if (!(options STREAM_DISABLE_OPEN_BASEDIR)) {
if (php_check_open_basedir(url TSRMLS_CC)) {
return 0;
@@ -1221,7 +1221,7 @@
if (((options STREAM_DISABLE_OPEN_BASEDIR) == 0)
php_check_open_basedir(trypath TSRMLS_CC)) {
return NULL;
}
-
+
return php_stream_fopen_rel(trypath, mode, opened_path,
options);
}
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main php.h
edink Thu May 25 18:47:21 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/main php.h Log: Missing definition, patch by Steph Fox http://cvs.php.net/viewcvs.cgi/php-src/main/php.h?r1=1.221.2.4r2=1.221.2.4.2.1diff_format=u Index: php-src/main/php.h diff -u php-src/main/php.h:1.221.2.4 php-src/main/php.h:1.221.2.4.2.1 --- php-src/main/php.h:1.221.2.4Tue Mar 7 22:37:53 2006 +++ php-src/main/php.h Thu May 25 18:47:21 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php.h,v 1.221.2.4 2006/03/07 22:37:53 alexwaugh Exp $ */ +/* $Id: php.h,v 1.221.2.4.2.1 2006/05/25 18:47:21 edink Exp $ */ #ifndef PHP_H #define PHP_H @@ -334,6 +334,7 @@ /* PHP-named Zend macro wrappers */ #define PHP_FN ZEND_FN +#define PHP_MN ZEND_MN #define PHP_NAMED_FUNCTION ZEND_NAMED_FUNCTION #define PHP_FUNCTION ZEND_FUNCTION #define PHP_METHOD ZEND_METHOD -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php.h
edink Thu May 25 18:48:31 2006 UTC Modified files: /php-src/main php.h Log: MFB: Missing definition, patch by Steph Fox http://cvs.php.net/viewcvs.cgi/php-src/main/php.h?r1=1.229r2=1.230diff_format=u Index: php-src/main/php.h diff -u php-src/main/php.h:1.229 php-src/main/php.h:1.230 --- php-src/main/php.h:1.229Wed Mar 8 14:41:45 2006 +++ php-src/main/php.h Thu May 25 18:48:30 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php.h,v 1.229 2006/03/08 14:41:45 iliaa Exp $ */ +/* $Id: php.h,v 1.230 2006/05/25 18:48:30 edink Exp $ */ #ifndef PHP_H #define PHP_H @@ -330,6 +330,7 @@ /* PHP-named Zend macro wrappers */ #define PHP_FN ZEND_FN +#define PHP_MN ZEND_MN #define PHP_NAMED_FUNCTION ZEND_NAMED_FUNCTION #define PHP_FUNCTION ZEND_FUNCTION #define PHP_METHOD ZEND_METHOD -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main main.c
edink Wed May 24 22:00:15 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main main.c
Log:
Initialize windows globals, fixes #37428
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.640.2.23.2.5r2=1.640.2.23.2.6diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.5 php-src/main/main.c:1.640.2.23.2.6
--- php-src/main/main.c:1.640.2.23.2.5 Fri May 19 06:09:15 2006
+++ php-src/main/main.c Wed May 24 22:00:15 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.23.2.5 2006/05/19 06:09:15 dmitry Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.6 2006/05/24 22:00:15 edink Exp $ */
/* {{{ includes
*/
@@ -30,6 +30,7 @@
#ifdef PHP_WIN32
#include win32/time.h
#include win32/signal.h
+#include win32/php_win32_globals.h
#include process.h
#elif defined(NETWARE)
#include sys/timeval.h
@@ -1436,6 +1437,9 @@
executor_globals = ts_resource(executor_globals_id);
ts_allocate_id(core_globals_id, sizeof(php_core_globals),
(ts_allocate_ctor) core_globals_ctor, NULL);
core_globals = ts_resource(core_globals_id);
+#ifdef PHP_WIN32
+ ts_allocate_id(php_win32_core_globals_id,
sizeof(php_win32_core_globals), (ts_allocate_ctor) php_win32_core_globals_ctor,
NULL);
+#endif
#endif
EG(bailout) = NULL;
EG(error_reporting) = E_ALL ~E_NOTICE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
edink Wed May 24 22:00:57 2006 UTC
Modified files:
/php-src/main main.c
Log:
MFB: Initialize windows globals, fixes #37428
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.690r2=1.691diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.690 php-src/main/main.c:1.691
--- php-src/main/main.c:1.690 Fri May 19 06:11:02 2006
+++ php-src/main/main.c Wed May 24 22:00:57 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.690 2006/05/19 06:11:02 dmitry Exp $ */
+/* $Id: main.c,v 1.691 2006/05/24 22:00:57 edink Exp $ */
/* {{{ includes
*/
@@ -30,6 +30,7 @@
#ifdef PHP_WIN32
#include win32/time.h
#include win32/signal.h
+#include win32/php_win32_globals.h
#include process.h
#elif defined(NETWARE)
#include sys/timeval.h
@@ -1539,6 +1540,9 @@
executor_globals = ts_resource(executor_globals_id);
ts_allocate_id(core_globals_id, sizeof(php_core_globals),
(ts_allocate_ctor) core_globals_ctor, NULL);
core_globals = ts_resource(core_globals_id);
+#ifdef PHP_WIN32
+ ts_allocate_id(php_win32_core_globals_id,
sizeof(php_win32_core_globals), (ts_allocate_ctor) php_win32_core_globals_ctor,
NULL);
+#endif
#endif
EG(bailout) = NULL;
EG(error_reporting) = E_ALL ~E_NOTICE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
edink Wed May 24 22:04:57 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.44r2=1.2027.2.547.2.45diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.44 php-src/NEWS:1.2027.2.547.2.45 --- php-src/NEWS:1.2027.2.547.2.44 Wed May 24 21:24:29 2006 +++ php-src/NEWSWed May 24 22:04:57 2006 @@ -59,6 +59,8 @@ - Fixed bug #37457 (Crash when an exception is thrown in accept() method of FilterIterator). (Marcus) - Fixed bug #37456 (DOMElement-setAttribute() loops forever). (Rob) +- Fixed bug #37428 (PHP crashes on windows if there are startup errors + and event log is used for logging them). (Edin) - Fixed bug #37418 (tidy module crashes on shutdown). (Tony) - Fixed bug #37416 (iterator_to_array() hides exceptions thrown in rewind() method). (Tony) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/imap .cvsignore imap.dsp
edink Thu May 18 21:12:55 2006 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/imap .cvsignore imap.dsp Log: Fix windows build http://cvs.php.net/viewcvs.cgi/php-src/ext/imap/.cvsignore?r1=1.11.4.1r2=1.11.4.1.2.1diff_format=u Index: php-src/ext/imap/.cvsignore diff -u php-src/ext/imap/.cvsignore:1.11.4.1 php-src/ext/imap/.cvsignore:1.11.4.1.2.1 --- php-src/ext/imap/.cvsignore:1.11.4.1Sun Oct 10 16:22:39 2004 +++ php-src/ext/imap/.cvsignore Thu May 18 21:12:55 2006 @@ -15,3 +15,4 @@ Debug_TS *.gcda *.gcno +*.dsw http://cvs.php.net/viewcvs.cgi/php-src/ext/imap/imap.dsp?r1=1.14.14.2r2=1.14.14.3diff_format=u Index: php-src/ext/imap/imap.dsp diff -u php-src/ext/imap/imap.dsp:1.14.14.2 php-src/ext/imap/imap.dsp:1.14.14.3 --- php-src/ext/imap/imap.dsp:1.14.14.2 Wed Jan 4 12:56:09 2006 +++ php-src/ext/imap/imap.dsp Thu May 18 21:12:55 2006 @@ -151,10 +151,6 @@ SOURCE=.\php_imap.c # End Source File -# Begin Source File - -SOURCE=..\..\win32\sendmail.c -# End Source File # End Group # Begin Group Header Files -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cgi config.w32 /sapi/cli config.w32
edink Thu May 18 21:46:12 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi config.w32
/php-src/sapi/cli config.w32
Log:
Give exe files 8MB stack (same default as on Linux) instead of Windows
default 1MB
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/config.w32?r1=1.2.4.1r2=1.2.4.1.2.1diff_format=u
Index: php-src/sapi/cgi/config.w32
diff -u php-src/sapi/cgi/config.w32:1.2.4.1
php-src/sapi/cgi/config.w32:1.2.4.1.2.1
--- php-src/sapi/cgi/config.w32:1.2.4.1 Thu Feb 2 08:17:23 2006
+++ php-src/sapi/cgi/config.w32 Thu May 18 21:46:12 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.2.4.1 2006/02/02 08:17:23 dmitry Exp $
+// $Id: config.w32,v 1.2.4.1.2.1 2006/05/18 21:46:12 edink Exp $
ARG_ENABLE('cgi', 'Build CGI version of PHP', 'yes');
ARG_ENABLE('fastcgi', 'Build FastCGI support into CGI binary', 'yes');
@@ -15,6 +15,8 @@
if (PHP_CGI == yes) {
AC_DEFINE('PHP_FASTCGI', PHP_FASTCGI == yes ? 1 : 0);
+ ADD_FLAG(LDFLAGS_CGI, /stack:8388608);
+
if (PHP_FASTCGI == yes) {
SAPI('cgi', 'cgi_main.c getopt.c fastcgi.c', 'php-cgi.exe', '/I
sapi/cgi/libfcgi/include /D FCGI_STATIC');
ADD_FLAG('LIBS_CGI', 'ws2_32.lib kernel32.lib advapi32.lib');
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cli/config.w32?r1=1.4r2=1.4.4.1diff_format=u
Index: php-src/sapi/cli/config.w32
diff -u php-src/sapi/cli/config.w32:1.4 php-src/sapi/cli/config.w32:1.4.4.1
--- php-src/sapi/cli/config.w32:1.4 Sat May 14 19:33:18 2005
+++ php-src/sapi/cli/config.w32 Thu May 18 21:46:12 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.4 2005/05/14 19:33:18 helly Exp $
+// $Id: config.w32,v 1.4.4.1 2006/05/18 21:46:12 edink Exp $
ARG_ENABLE('cli', 'Build CLI version of PHP', 'yes');
ARG_ENABLE('crt-debug', 'Extra CRT debugging', 'no');
@@ -10,9 +10,11 @@
if (PHP_CRT_DEBUG == yes) {
ADD_FLAG(CFLAGS_CLI, /D PHP_WIN32_DEBUG_HEAP);
}
+ ADD_FLAG(LDFLAGS_CLI, /stack:8388608);
}
if (PHP_CLI_WIN32 == yes) {
SAPI('cli_win32', 'getopt.c cli_win32.c php_cli_readline.c',
'php-win.exe');
+ ADD_FLAG(LDFLAGS_CLI_WIN32, /stack:8388608);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre config.w32
edink Thu May 18 21:50:51 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre config.w32
Log:
Use heap insted of stack for recursion in hope of avoid stack overflow crashes
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5r2=1.4.2.5.2.1diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5
php-src/ext/pcre/config.w32:1.4.2.5.2.1
--- php-src/ext/pcre/config.w32:1.4.2.5 Mon Mar 6 22:49:16 2006
+++ php-src/ext/pcre/config.w32 Thu May 18 21:50:51 2006
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.4.2.5 2006/03/06 22:49:16 sebastian Exp $
+// $Id: config.w32,v 1.4.2.5.2.1 2006/05/18 21:50:51 edink Exp $
// vim:ft=javascript
ARG_WITH(pcre-regex, Perl Compatible Regular Expressions, yes);
if (PHP_PCRE_REGEX == yes) {
EXTENSION(pcre, php_pcre.c, PHP_PCRE_REGEX_SHARED,
- -DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP
-DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=1000
-DMATCH_LIMIT_RECURSION=1000 -Iext/pcre/pcrelib);
+ -DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP
-DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=1000
-DMATCH_LIMIT_RECURSION=1000 -DNO_RECURSE -Iext/pcre/pcrelib);
ADD_SOURCES(ext/pcre/pcrelib, pcre_chartables.c
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_dfa_exec.c pcre_exec.c
pcre_fullinfo.c pcre_get.c pcre_globals.c pcre_info.c pcre_maketables.c
pcre_ord2utf8.c pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c
pcre_valid_utf8.c pcre_version.c pcre_xclass.c, pcre);
ADD_DEF_FILE(ext\\pcre\\php_pcre.def);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre config.w32
I belive its better to have slower pcre than having php crash left and
right. Stack usage of php-5.1+ is so huge pcre becomes a real stability
issue due.
Edin
Nuno Lopes wrote:
This shouldn't be necessary because of Andrei's patch that allows you to
configure the max recursion depth through a ini setting.
Also, this patch will make pcre much slower (it will do thousands of
malloc's).
Nuno
- Original Message -
edink Thu May 18 21:50:51 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre config.w32
Log:
Use heap insted of stack for recursion in hope of avoid stack
overflow crashes
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5r2=1.4.2.5.2.1diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5
php-src/ext/pcre/config.w32:1.4.2.5.2.1
--- php-src/ext/pcre/config.w32:1.4.2.5 Mon Mar 6 22:49:16 2006
+++ php-src/ext/pcre/config.w32 Thu May 18 21:50:51 2006
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.4.2.5 2006/03/06 22:49:16 sebastian Exp $
+// $Id: config.w32,v 1.4.2.5.2.1 2006/05/18 21:50:51 edink Exp $
// vim:ft=javascript
ARG_WITH(pcre-regex, Perl Compatible Regular Expressions, yes);
if (PHP_PCRE_REGEX == yes) {
EXTENSION(pcre, php_pcre.c, PHP_PCRE_REGEX_SHARED,
- -DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2
-DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=1000
-DMATCH_LIMIT_RECURSION=1000 -Iext/pcre/pcrelib);
+ -DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2
-DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=1000
-DMATCH_LIMIT_RECURSION=1000 -DNO_RECURSE -Iext/pcre/pcrelib);
ADD_SOURCES(ext/pcre/pcrelib, pcre_chartables.c
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_dfa_exec.c
pcre_exec.c pcre_fullinfo.c pcre_get.c pcre_globals.c pcre_info.c
pcre_maketables.c pcre_ord2utf8.c pcre_refcount.c pcre_study.c
pcre_tables.c pcre_try_flipped.c pcre_valid_utf8.c pcre_version.c
pcre_xclass.c, pcre);
ADD_DEF_FILE(ext\\pcre\\php_pcre.def);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_dblib config.w32 /ext/pdo_firebird config.w32 /ext/pdo_mysql config.w32 /ext/pdo_oci config.w32 /ext/pdo_pgsql config.w32 /ext/pdo_sqlite config.w32
edink Thu May 11 21:43:59 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_dblib config.w32
/php-src/ext/pdo_firebird config.w32
/php-src/ext/pdo_mysql config.w32
/php-src/ext/pdo_ociconfig.w32
/php-src/ext/pdo_pgsql config.w32
/php-src/ext/pdo_sqlite config.w32
Log:
Remove pecl includes (Steph), except pdo_odbc which will remain broke
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_dblib/config.w32?r1=1.7r2=1.7.4.1diff_format=u
Index: php-src/ext/pdo_dblib/config.w32
diff -u php-src/ext/pdo_dblib/config.w32:1.7
php-src/ext/pdo_dblib/config.w32:1.7.4.1
--- php-src/ext/pdo_dblib/config.w32:1.7Wed Feb 16 18:09:26 2005
+++ php-src/ext/pdo_dblib/config.w32Thu May 11 21:43:58 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7 2005/02/16 18:09:26 wez Exp $
+// $Id: config.w32,v 1.7.4.1 2006/05/11 21:43:58 edink Exp $
// vim:ft=javascript
ARG_WITH(pdo-dblib, freetds dblib (Sybase, MS-SQL) support for PDO, no);
@@ -12,7 +12,7 @@
PHP_PDO_DBLIB, null, null, true))
{
EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c
dblib_stmt.c);
- ADD_FLAG('CFLAGS_PDO_DBLIB', /I pecl /I ..\\pecl /D
PDO_DBLIB_FLAVOUR=\\\freetds\\\);
+ ADD_FLAG('CFLAGS_PDO_DBLIB', /D
PDO_DBLIB_FLAVOUR=\\\freetds\\\);
}
ADD_EXTENSION_DEP('pdo_dblib', 'pdo');
}
@@ -63,7 +63,7 @@
ADD_FLAG(CFLAGS_PDO_MSSQL, /DPDO_DBLIB_IS_MSSQL= +
PDO_DBLIB_FLAVOUR);
PDO_DBLIB_FLAVOUR = MSSQL_ + PDO_DBLIB_FLAVOUR;
}
- ADD_FLAG('CFLAGS_PDO_MSSQL', /I pecl /I ..\\pecl /D
PDO_DBLIB_FLAVOUR=\\\ + PDO_DBLIB_FLAVOUR + \\\);
+ ADD_FLAG('CFLAGS_PDO_MSSQL', /D PDO_DBLIB_FLAVOUR=\\\ +
PDO_DBLIB_FLAVOUR + \\\);
}
ADD_EXTENSION_DEP('pdo_mssql', 'pdo');
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_firebird/config.w32?r1=1.6r2=1.6.4.1diff_format=u
Index: php-src/ext/pdo_firebird/config.w32
diff -u php-src/ext/pdo_firebird/config.w32:1.6
php-src/ext/pdo_firebird/config.w32:1.6.4.1
--- php-src/ext/pdo_firebird/config.w32:1.6 Sat Jun 12 18:42:13 2004
+++ php-src/ext/pdo_firebird/config.w32 Thu May 11 21:43:59 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6 2004/06/12 18:42:13 abies Exp $
+// $Id: config.w32,v 1.6.4.1 2006/05/11 21:43:59 edink Exp $
// vim:ft=javascript
ARG_WITH(pdo-firebird, Firebird support for PDO, no);
@@ -10,7 +10,6 @@
) CHECK_HEADER_ADD_INCLUDE(ibase.h, CFLAGS_PDO_FIREBIRD,
PHP_PHP_BUILD + \\interbase\\include; + PHP_PDO_FIREBIRD)) {
EXTENSION(pdo_firebird, pdo_firebird.c firebird_driver.c
firebird_statement.c);
- ADD_FLAG('CFLAGS_PDO_FIREBIRD', /I ..\\pecl);
} else {
WARNING(pdo_firebird not enabled; libraries and headers not
found);
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/config.w32?r1=1.4r2=1.4.4.1diff_format=u
Index: php-src/ext/pdo_mysql/config.w32
diff -u php-src/ext/pdo_mysql/config.w32:1.4
php-src/ext/pdo_mysql/config.w32:1.4.4.1
--- php-src/ext/pdo_mysql/config.w32:1.4Sun Aug 15 15:56:33 2004
+++ php-src/ext/pdo_mysql/config.w32Thu May 11 21:43:59 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4 2004/08/15 15:56:33 helly Exp $
+// $Id: config.w32,v 1.4.4.1 2006/05/11 21:43:59 edink Exp $
// vim:ft=javascript
ARG_WITH(pdo-mysql, MySQL support for PDO, no);
@@ -7,7 +7,6 @@
if (CHECK_LIB(libmysql.lib, pdo_mysql, PHP_PDO_MYSQL)
CHECK_HEADER_ADD_INCLUDE(mysql.h, CFLAGS_PDO_MYSQL,
PHP_PHP_BUILD + \\include\\mysql; + PHP_PDO_MYSQL)) {
EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c
mysql_statement.c);
- ADD_FLAG('CFLAGS_PDO_MYSQL', /I ..\\pecl);
} else {
WARNING(pdo_mysql not enabled; libraries and headers not
found);
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_oci/config.w32?r1=1.6r2=1.6.4.1diff_format=u
Index: php-src/ext/pdo_oci/config.w32
diff -u php-src/ext/pdo_oci/config.w32:1.6
php-src/ext/pdo_oci/config.w32:1.6.4.1
--- php-src/ext/pdo_oci/config.w32:1.6 Thu Jan 20 15:54:35 2005
+++ php-src/ext/pdo_oci/config.w32 Thu May 11 21:43:59 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6 2005/01/20 15:54:35 edink Exp $
+// $Id: config.w32,v 1.6.4.1 2006/05/11 21:43:59 edink Exp $
// vim:ft=javascript
ARG_WITH(pdo-oci, Oracle OCI support for PDO, no);
@@ -32,7 +32,6 @@
pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header);
EXTENSION('pdo_oci', 'pdo_oci.c oci_driver.c oci_statement.c');
- ADD_FLAG('CFLAGS_PDO_OCI', /I ..\\pecl);
/* probe for some functions not present in older versions */
pdo_oci_inc_dir = FSO.GetFolder(pdo_oci_header);
@@ -70,7 +69,6 @@
pdo_oci_inc_dir =
[PHP-CVS] cvs: php-src /ext/pdo_dblib config.w32 /ext/pdo_firebird config.w32 /ext/pdo_mysql config.w32 /ext/pdo_oci config.w32 /ext/pdo_pgsql config.w32 /ext/pdo_sqlite config.w32
edink Thu May 11 21:48:57 2006 UTC
Modified files:
/php-src/ext/pdo_dblib config.w32
/php-src/ext/pdo_firebird config.w32
/php-src/ext/pdo_mysql config.w32
/php-src/ext/pdo_ociconfig.w32
/php-src/ext/pdo_pgsql config.w32
/php-src/ext/pdo_sqlite config.w32
Log:
MFB: Remove pecl includes (Steph), except pdo_odbc which will remain broke
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_dblib/config.w32?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/pdo_dblib/config.w32
diff -u php-src/ext/pdo_dblib/config.w32:1.7
php-src/ext/pdo_dblib/config.w32:1.8
--- php-src/ext/pdo_dblib/config.w32:1.7Wed Feb 16 18:09:26 2005
+++ php-src/ext/pdo_dblib/config.w32Thu May 11 21:48:57 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7 2005/02/16 18:09:26 wez Exp $
+// $Id: config.w32,v 1.8 2006/05/11 21:48:57 edink Exp $
// vim:ft=javascript
ARG_WITH(pdo-dblib, freetds dblib (Sybase, MS-SQL) support for PDO, no);
@@ -12,7 +12,7 @@
PHP_PDO_DBLIB, null, null, true))
{
EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c
dblib_stmt.c);
- ADD_FLAG('CFLAGS_PDO_DBLIB', /I pecl /I ..\\pecl /D
PDO_DBLIB_FLAVOUR=\\\freetds\\\);
+ ADD_FLAG('CFLAGS_PDO_DBLIB', /D
PDO_DBLIB_FLAVOUR=\\\freetds\\\);
}
ADD_EXTENSION_DEP('pdo_dblib', 'pdo');
}
@@ -63,7 +63,7 @@
ADD_FLAG(CFLAGS_PDO_MSSQL, /DPDO_DBLIB_IS_MSSQL= +
PDO_DBLIB_FLAVOUR);
PDO_DBLIB_FLAVOUR = MSSQL_ + PDO_DBLIB_FLAVOUR;
}
- ADD_FLAG('CFLAGS_PDO_MSSQL', /I pecl /I ..\\pecl /D
PDO_DBLIB_FLAVOUR=\\\ + PDO_DBLIB_FLAVOUR + \\\);
+ ADD_FLAG('CFLAGS_PDO_MSSQL', /D PDO_DBLIB_FLAVOUR=\\\ +
PDO_DBLIB_FLAVOUR + \\\);
}
ADD_EXTENSION_DEP('pdo_mssql', 'pdo');
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_firebird/config.w32?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/pdo_firebird/config.w32
diff -u php-src/ext/pdo_firebird/config.w32:1.6
php-src/ext/pdo_firebird/config.w32:1.7
--- php-src/ext/pdo_firebird/config.w32:1.6 Sat Jun 12 18:42:13 2004
+++ php-src/ext/pdo_firebird/config.w32 Thu May 11 21:48:57 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6 2004/06/12 18:42:13 abies Exp $
+// $Id: config.w32,v 1.7 2006/05/11 21:48:57 edink Exp $
// vim:ft=javascript
ARG_WITH(pdo-firebird, Firebird support for PDO, no);
@@ -10,7 +10,6 @@
) CHECK_HEADER_ADD_INCLUDE(ibase.h, CFLAGS_PDO_FIREBIRD,
PHP_PHP_BUILD + \\interbase\\include; + PHP_PDO_FIREBIRD)) {
EXTENSION(pdo_firebird, pdo_firebird.c firebird_driver.c
firebird_statement.c);
- ADD_FLAG('CFLAGS_PDO_FIREBIRD', /I ..\\pecl);
} else {
WARNING(pdo_firebird not enabled; libraries and headers not
found);
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/config.w32?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/pdo_mysql/config.w32
diff -u php-src/ext/pdo_mysql/config.w32:1.4
php-src/ext/pdo_mysql/config.w32:1.5
--- php-src/ext/pdo_mysql/config.w32:1.4Sun Aug 15 15:56:33 2004
+++ php-src/ext/pdo_mysql/config.w32Thu May 11 21:48:57 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4 2004/08/15 15:56:33 helly Exp $
+// $Id: config.w32,v 1.5 2006/05/11 21:48:57 edink Exp $
// vim:ft=javascript
ARG_WITH(pdo-mysql, MySQL support for PDO, no);
@@ -7,7 +7,6 @@
if (CHECK_LIB(libmysql.lib, pdo_mysql, PHP_PDO_MYSQL)
CHECK_HEADER_ADD_INCLUDE(mysql.h, CFLAGS_PDO_MYSQL,
PHP_PHP_BUILD + \\include\\mysql; + PHP_PDO_MYSQL)) {
EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c
mysql_statement.c);
- ADD_FLAG('CFLAGS_PDO_MYSQL', /I ..\\pecl);
} else {
WARNING(pdo_mysql not enabled; libraries and headers not
found);
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_oci/config.w32?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/pdo_oci/config.w32
diff -u php-src/ext/pdo_oci/config.w32:1.6 php-src/ext/pdo_oci/config.w32:1.7
--- php-src/ext/pdo_oci/config.w32:1.6 Thu Jan 20 15:54:35 2005
+++ php-src/ext/pdo_oci/config.w32 Thu May 11 21:48:57 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6 2005/01/20 15:54:35 edink Exp $
+// $Id: config.w32,v 1.7 2006/05/11 21:48:57 edink Exp $
// vim:ft=javascript
ARG_WITH(pdo-oci, Oracle OCI support for PDO, no);
@@ -32,7 +32,6 @@
pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header);
EXTENSION('pdo_oci', 'pdo_oci.c oci_driver.c oci_statement.c');
- ADD_FLAG('CFLAGS_PDO_OCI', /I ..\\pecl);
/* probe for some functions not present in older versions */
pdo_oci_inc_dir = FSO.GetFolder(pdo_oci_header);
@@ -70,7 +69,6 @@
pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header);
EXTENSION('pdo_oci8', 'pdo_oci.c
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
edink Mon May 8 20:18:34 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Update news http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.4r2=1.2027.2.547.2.5diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.4 php-src/NEWS:1.2027.2.547.2.5 --- php-src/NEWS:1.2027.2.547.2.4 Mon May 8 15:29:27 2006 +++ php-src/NEWSMon May 8 20:18:34 2006 @@ -1,6 +1,8 @@ PHPNEWS ||| ?? ??? 2006, PHP 5.2.0 +- Added support for Apache 2.2 handler in the Windows distro. (Edin) +- Added pg_field_table() function. (Edin) - Add implementation of curl_multi_info_read (Brian) - Fixed bug #37348 (make PEAR install ignore open_basedir). (Ilia) - Fixed bug #37313 (sigemptyset() used without including signal.h). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/unicode config.w32
edink Mon May 8 21:06:34 2006 UTC
Modified files:
/php-src/ext/unicodeconfig.w32
Log:
Added constants.c to the windows build
http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/config.w32?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/unicode/config.w32
diff -u php-src/ext/unicode/config.w32:1.9 php-src/ext/unicode/config.w32:1.10
--- php-src/ext/unicode/config.w32:1.9 Fri May 5 21:37:08 2006
+++ php-src/ext/unicode/config.w32 Mon May 8 21:06:34 2006
@@ -1,5 +1,5 @@
-// $Id: config.w32,v 1.9 2006/05/05 21:37:08 fmk Exp $
+// $Id: config.w32,v 1.10 2006/05/08 21:06:34 edink Exp $
// vim:ft=javascript
-EXTENSION(unicode, unicode.c unicode_iterators.c collator.c locale.c
property.c, false);
+EXTENSION(unicode, unicode.c unicode_iterators.c collator.c locale.c
property.c constants.c, false);
AC_DEFINE('HAVE_UNICODE', 1, 'ICU API extension');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /win32/build confutils.js
edink Sun May 7 00:04:56 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/win32/buildconfutils.js
Log:
Enable separate build dir for SAPIs, the same way it is possible for
EXTENSIONs
http://cvs.php.net/viewcvs.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1r2=1.60.2.1.2.1diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1
php-src/win32/build/confutils.js:1.60.2.1.2.1
--- php-src/win32/build/confutils.js:1.60.2.1 Sun Jan 1 12:50:20 2006
+++ php-src/win32/build/confutils.jsSun May 7 00:04:56 2006
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.60.2.1 2006/01/01 12:50:20 sniper Exp $
+// $Id: confutils.js,v 1.60.2.1.2.1 2006/05/07 00:04:56 edink Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -871,14 +871,20 @@
return resname;
}
-function SAPI(sapiname, file_list, makefiletarget, cflags)
+function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir)
{
var SAPI = sapiname.toUpperCase();
var ldflags;
var resname;
var ld = @$(LD);
- STDOUT.WriteLine(Enabling SAPI + configure_module_dirname);
+ if (typeof(obj_dir) == undefined) {
+ sapiname_for_printing = configure_module_dirname;
+ } else {
+ sapiname_for_printing = configure_module_dirname + (via +
obj_dir + );
+ }
+
+ STDOUT.WriteLine(Enabling SAPI + sapiname_for_printing);
MFO.WriteBlankLines(1);
MFO.WriteLine(# objects for SAPI + sapiname);
@@ -888,7 +894,7 @@
ADD_FLAG('CFLAGS_' + SAPI, cflags);
}
- ADD_SOURCES(configure_module_dirname, file_list, sapiname);
+ ADD_SOURCES(configure_module_dirname, file_list, sapiname, obj_dir);
MFO.WriteBlankLines(1);
MFO.WriteLine(# SAPI + sapiname);
MFO.WriteBlankLines(1);
@@ -897,7 +903,7 @@
resname = generate_version_info_resource(makefiletarget,
configure_module_dirname);
MFO.WriteLine(makefiletarget + : $(BUILD_DIR)\\ + makefiletarget);
- MFO.WriteLine([EMAIL PROTECTED] SAPI + configure_module_dirname +
build complete);
+ MFO.WriteLine([EMAIL PROTECTED] SAPI + sapiname_for_printing +
build complete);
MFO.WriteLine($(BUILD_DIR)\\ + makefiletarget + : $(DEPS_ + SAPI +
) $( + SAPI + _GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\ +
resname);
if (makefiletarget.match(new RegExp(\\.dll$))) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
edink Sun May 7 00:07:53 2006 UTC
Modified files:
/php-src/win32/buildconfutils.js
Log:
MFB: Enable separate build dir for SAPIs, the same way it is possible for
EXTENSIONs
http://cvs.php.net/viewcvs.cgi/php-src/win32/build/confutils.js?r1=1.61r2=1.62diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.61
php-src/win32/build/confutils.js:1.62
--- php-src/win32/build/confutils.js:1.61 Sun Jan 1 13:09:59 2006
+++ php-src/win32/build/confutils.jsSun May 7 00:07:53 2006
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.61 2006/01/01 13:09:59 sniper Exp $
+// $Id: confutils.js,v 1.62 2006/05/07 00:07:53 edink Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -871,14 +871,20 @@
return resname;
}
-function SAPI(sapiname, file_list, makefiletarget, cflags)
+function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir)
{
var SAPI = sapiname.toUpperCase();
var ldflags;
var resname;
var ld = @$(LD);
- STDOUT.WriteLine(Enabling SAPI + configure_module_dirname);
+ if (typeof(obj_dir) == undefined) {
+ sapiname_for_printing = configure_module_dirname;
+ } else {
+ sapiname_for_printing = configure_module_dirname + (via +
obj_dir + );
+ }
+
+ STDOUT.WriteLine(Enabling SAPI + sapiname_for_printing);
MFO.WriteBlankLines(1);
MFO.WriteLine(# objects for SAPI + sapiname);
@@ -888,7 +894,7 @@
ADD_FLAG('CFLAGS_' + SAPI, cflags);
}
- ADD_SOURCES(configure_module_dirname, file_list, sapiname);
+ ADD_SOURCES(configure_module_dirname, file_list, sapiname, obj_dir);
MFO.WriteBlankLines(1);
MFO.WriteLine(# SAPI + sapiname);
MFO.WriteBlankLines(1);
@@ -897,7 +903,7 @@
resname = generate_version_info_resource(makefiletarget,
configure_module_dirname);
MFO.WriteLine(makefiletarget + : $(BUILD_DIR)\\ + makefiletarget);
- MFO.WriteLine([EMAIL PROTECTED] SAPI + configure_module_dirname +
build complete);
+ MFO.WriteLine([EMAIL PROTECTED] SAPI + sapiname_for_printing +
build complete);
MFO.WriteLine($(BUILD_DIR)\\ + makefiletarget + : $(DEPS_ + SAPI +
) $( + SAPI + _GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\ +
resname);
if (makefiletarget.match(new RegExp(\\.dll$))) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/apache2handler config.w32
edink Sun May 7 00:09:20 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apache2handlerconfig.w32
Log:
Enable parallel build against Apache 2.2 libs and headers
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache2handler/config.w32?r1=1.1r2=1.1.6.1diff_format=u
Index: php-src/sapi/apache2handler/config.w32
diff -u php-src/sapi/apache2handler/config.w32:1.1
php-src/sapi/apache2handler/config.w32:1.1.6.1
--- php-src/sapi/apache2handler/config.w32:1.1 Fri Dec 19 18:28:56 2003
+++ php-src/sapi/apache2handler/config.w32 Sun May 7 00:09:20 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.1 2003/12/19 18:28:56 wez Exp $
+// $Id: config.w32,v 1.1.6.1 2006/05/07 00:09:20 edink Exp $
ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no');
@@ -16,3 +16,20 @@
WARNING(Could not find apache2 libraries/headers);
}
}
+
+ARG_ENABLE('apache2-2handler', 'Build Apache 2.2.x handler', 'no');
+
+if (PHP_APACHE2_2HANDLER != no) {
+ if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE2_2HANDLER,
PHP_PHP_BUILD + \\include\\apache2_2)
+ CHECK_LIB(libhttpd.lib, apache2_2handler,
PHP_PHP_BUILD + \\lib\\apache2_2)
+ CHECK_LIB(libapr-1.lib, apache2_2handler,
PHP_PHP_BUILD + \\lib\\apache2_2)
+ CHECK_LIB(libaprutil-1.lib, apache2_2handler,
PHP_PHP_BUILD + \\lib\\apache2_2)
+ ) {
+ SAPI('apache2_2handler', 'mod_php5.c sapi_apache2.c
apache_config.c php_functions.c',
+ 'php' + PHP_VERSION + 'apache2_2.dll',
+ '/D PHP_APACHE2_EXPORTS /I win32',
+ 'sapi\\apache2_2handler');
+ } else {
+ WARNING(Could not find apache2.2 libraries/headers);
+ }
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2handler config.w32
edink Sun May 7 00:10:06 2006 UTC
Modified files:
/php-src/sapi/apache2handlerconfig.w32
Log:
MFB: Enable parallel build against Apache 2.2 libs and headers
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache2handler/config.w32?r1=1.1r2=1.2diff_format=u
Index: php-src/sapi/apache2handler/config.w32
diff -u php-src/sapi/apache2handler/config.w32:1.1
php-src/sapi/apache2handler/config.w32:1.2
--- php-src/sapi/apache2handler/config.w32:1.1 Fri Dec 19 18:28:56 2003
+++ php-src/sapi/apache2handler/config.w32 Sun May 7 00:10:06 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.1 2003/12/19 18:28:56 wez Exp $
+// $Id: config.w32,v 1.2 2006/05/07 00:10:06 edink Exp $
ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no');
@@ -16,3 +16,20 @@
WARNING(Could not find apache2 libraries/headers);
}
}
+
+ARG_ENABLE('apache2-2handler', 'Build Apache 2.2.x handler', 'no');
+
+if (PHP_APACHE2_2HANDLER != no) {
+ if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE2_2HANDLER,
PHP_PHP_BUILD + \\include\\apache2_2)
+ CHECK_LIB(libhttpd.lib, apache2_2handler,
PHP_PHP_BUILD + \\lib\\apache2_2)
+ CHECK_LIB(libapr-1.lib, apache2_2handler,
PHP_PHP_BUILD + \\lib\\apache2_2)
+ CHECK_LIB(libaprutil-1.lib, apache2_2handler,
PHP_PHP_BUILD + \\lib\\apache2_2)
+ ) {
+ SAPI('apache2_2handler', 'mod_php5.c sapi_apache2.c
apache_config.c php_functions.c',
+ 'php' + PHP_VERSION + 'apache2_2.dll',
+ '/D PHP_APACHE2_EXPORTS /I win32',
+ 'sapi\\apache2_2handler');
+ } else {
+ WARNING(Could not find apache2.2 libraries/headers);
+ }
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pgsql pgsql.c php_pgsql.h
edink Sun May 7 00:28:33 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pgsql pgsql.c php_pgsql.h
Log:
MFH: Added pg_field_table() as per req: #36750
http://cvs.php.net/viewcvs.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.13r2=1.331.2.13.2.1diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13
php-src/ext/pgsql/pgsql.c:1.331.2.13.2.1
--- php-src/ext/pgsql/pgsql.c:1.331.2.13Mon Apr 10 19:51:55 2006
+++ php-src/ext/pgsql/pgsql.c Sun May 7 00:28:32 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.331.2.13 2006/04/10 19:51:55 helly Exp $ */
+/* $Id: pgsql.c,v 1.331.2.13.2.1 2006/05/07 00:28:32 edink Exp $ */
#include stdlib.h
@@ -151,6 +151,7 @@
PHP_FE(pg_field_type_oid, NULL)
PHP_FE(pg_field_prtlen, NULL)
PHP_FE(pg_field_is_null,NULL)
+ PHP_FE(pg_field_table, NULL)
/* async message function */
PHP_FE(pg_get_notify, NULL)
PHP_FE(pg_get_pid, NULL)
@@ -1694,6 +1695,95 @@
}
/* }}} */
+/* {{{ proto mixed pg_field_table(resource result, int field_number[, bool
oid_only])
+ Returns the name of the table field belongs to, or table's oid if oid_only
is true */
+PHP_FUNCTION(pg_field_table)
+{
+ zval *result;
+ pgsql_result_handle *pg_result;
+ long fnum = -1;
+ zend_bool return_oid = 0;
+ Oid oid;
+ smart_str hash_key = {0};
+ char *table_name;
+ zend_rsrc_list_entry *field_table;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rl|b!, result,
fnum, return_oid) == FAILURE) {
+ return;
+ }
+
+ ZEND_FETCH_RESOURCE(pg_result, pgsql_result_handle *, result, -1,
PostgreSQL result, le_result);
+
+ if (fnum 0 || fnum = PQnfields(pg_result-result)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Bad field offset
specified);
+ RETURN_FALSE;
+ }
+
+ oid = PQftable(pg_result-result, fnum);
+
+ if (InvalidOid == oid) {
+ RETURN_FALSE;
+ }
+
+
+ if (return_oid) {
+ if (oid LONG_MAX) {
+ smart_str oidstr = {0};
+ smart_str_append_unsigned(oidstr, oid);
+ smart_str_0(oidstr);
+ RETURN_STRINGL(oidstr.c, oidstr.len, 0);
+ } else {
+ RETURN_LONG((long)oid);
+ }
+ }
+
+ /* try to lookup the table name in the resource list */
+ smart_str_appends(hash_key, pgsql_table_oid_);
+ smart_str_append_unsigned(hash_key, oid);
+ smart_str_0(hash_key);
+
+ if (zend_hash_find(EG(regular_list), hash_key.c, hash_key.len+1, (void
**) field_table) == SUCCESS) {
+ smart_str_free(hash_key);
+ RETURN_STRING((char *)field_table-ptr, 1);
+ } else { /* Not found, lookup by querying PostgreSQL system tables */
+ PGresult *tmp_res;
+ smart_str querystr = {0};
+ zend_rsrc_list_entry new_field_table;
+
+ smart_str_appends(querystr, select relname from pg_class
where oid=);
+ smart_str_append_unsigned(querystr, oid);
+ smart_str_0(querystr);
+
+
+ if ((tmp_res = PQexec(pg_result-conn, querystr.c)) == NULL ||
PQresultStatus(tmp_res) != PGRES_TUPLES_OK) {
+ if (tmp_res) {
+ PQclear(tmp_res);
+ }
+ smart_str_free(querystr);
+ smart_str_free(hash_key);
+ RETURN_FALSE;
+ }
+
+ smart_str_free(querystr);
+
+ if ((table_name = PQgetvalue(tmp_res, 0, 0)) == NULL) {
+ PQclear(tmp_res);
+ smart_str_free(hash_key);
+ RETURN_FALSE;
+ }
+
+ Z_TYPE(new_field_table) = le_string;
+ new_field_table.ptr = estrdup(table_name);
+ zend_hash_update(EG(regular_list), hash_key.c, hash_key.len+1,
(void *) new_field_table, sizeof(zend_rsrc_list_entry), NULL);
+
+ smart_str_free(hash_key);
+ PQclear(tmp_res);
+ RETURN_STRING(table_name, 1);
+ }
+
+}
+/* }}} */
+
#define PHP_PG_FIELD_NAME 1
#define PHP_PG_FIELD_SIZE 2
#define PHP_PG_FIELD_TYPE 3
http://cvs.php.net/viewcvs.cgi/php-src/ext/pgsql/php_pgsql.h?r1=1.73.2.1r2=1.73.2.1.2.1diff_format=u
Index: php-src/ext/pgsql/php_pgsql.h
diff -u php-src/ext/pgsql/php_pgsql.h:1.73.2.1
php-src/ext/pgsql/php_pgsql.h:1.73.2.1.2.1
--- php-src/ext/pgsql/php_pgsql.h:1.73.2.1 Sun Jan 1 12:50:12 2006
+++ php-src/ext/pgsql/php_pgsql.h Sun May 7 00:28:32 2006
@@ -17,7 +17,7 @@
[PHP-CVS] cvs: php-src(PHP_5_1) /sapi/apache php_apache.c
edink Wed Apr 26 09:31:23 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/sapi/apachephp_apache.c Log: Correctly import external data (#33292) http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache/php_apache.c?r1=1.89.2.3r2=1.89.2.4diff_format=u Index: php-src/sapi/apache/php_apache.c diff -u php-src/sapi/apache/php_apache.c:1.89.2.3 php-src/sapi/apache/php_apache.c:1.89.2.4 --- php-src/sapi/apache/php_apache.c:1.89.2.3 Sun Jan 1 12:50:18 2006 +++ php-src/sapi/apache/php_apache.cWed Apr 26 09:31:23 2006 @@ -17,7 +17,7 @@ | David Sklar [EMAIL PROTECTED] | +--+ */ -/* $Id: php_apache.c,v 1.89.2.3 2006/01/01 12:50:18 sniper Exp $ */ +/* $Id: php_apache.c,v 1.89.2.4 2006/04/26 09:31:23 edink Exp $ */ #include php_apache_http.h @@ -34,8 +34,13 @@ #define SECTION(name) PUTS(h2 name /h2\n) +#ifndef PHP_WIN32 extern module *top_module; extern module **ap_loaded_modules; +#else +extern __declspec(dllimport) module *top_module; +extern __declspec(dllimport) module **ap_loaded_modules; +#endif PHP_FUNCTION(virtual); PHP_FUNCTION(apache_request_headers); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache php_apache.c
edink Wed Apr 26 09:32:11 2006 UTC Modified files: /php-src/sapi/apachephp_apache.c Log: MFB: Correctly import external data (#33292) http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache/php_apache.c?r1=1.93r2=1.94diff_format=u Index: php-src/sapi/apache/php_apache.c diff -u php-src/sapi/apache/php_apache.c:1.93 php-src/sapi/apache/php_apache.c:1.94 --- php-src/sapi/apache/php_apache.c:1.93 Tue Mar 7 14:43:16 2006 +++ php-src/sapi/apache/php_apache.cWed Apr 26 09:32:11 2006 @@ -17,7 +17,7 @@ | David Sklar [EMAIL PROTECTED] | +--+ */ -/* $Id: php_apache.c,v 1.93 2006/03/07 14:43:16 iliaa Exp $ */ +/* $Id: php_apache.c,v 1.94 2006/04/26 09:32:11 edink Exp $ */ #include php_apache_http.h @@ -34,8 +34,13 @@ #define SECTION(name) PUTS(h2 name /h2\n) +#ifndef PHP_WIN32 extern module *top_module; extern module **ap_loaded_modules; +#else +extern __declspec(dllimport) module *top_module; +extern __declspec(dllimport) module **ap_loaded_modules; +#endif PHP_FUNCTION(virtual); PHP_FUNCTION(apache_request_headers); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
edink Wed Apr 26 14:23:51 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: BFN http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.533r2=1.2027.2.534diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.533 php-src/NEWS:1.2027.2.534 --- php-src/NEWS:1.2027.2.533 Wed Apr 26 13:56:57 2006 +++ php-src/NEWSWed Apr 26 14:23:51 2006 @@ -256,6 +256,7 @@ (Ilia) - Fixed bug #35785 (SimpleXML causes memory read error zend engine). (Marcus) - Fixed bug #34272 (empty array onto COM object blows up). (Rob) +- Fixed bug #33292 (apache_get_modules() crashes on Windows). (Edin) - Fixed bug #29476 (sqlite_fetch_column_types() locks the database forever). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
Wasn't SOAP cache left out in 5.1.3? Also I just added a NEWS entry, sorry for that :) Should I move the tag if you didn't already make tarballs? Edin -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
