[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Sep 23 01:33:17 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2110r2=1.2111ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2110 php-src/ChangeLog:1.2111 --- php-src/ChangeLog:1.2110Thu Sep 22 01:44:27 2005 +++ php-src/ChangeLog Fri Sep 23 01:33:16 2005 @@ -1,3 +1,67 @@ +2005-09-22 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_0) + ext/mysqli/mysqli_api.c + ext/mysqli/mysqli_api.c: + MFH: fix #32081 (mysqli_real_connect(): mysqli.default_socket in php.ini + has no effect) for real + +* ext/mysqli/mysqli_api.c: + fix #32081 (mysqli_real_connect(): mysqli.default_socket in php.ini has no + effect) for real + +* ZendEngine2/zend_modules.h + ZendEngine2/zend_modules.h: + bump API number + +* (PHP_5_1) + NEWS: + BFN + +* (PHP_5_1) + ZendEngine2/zend_compile.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_execute.skl + ZendEngine2/zend_vm_opcodes.h + ZendEngine2/tests/bug33771.phpt: + MFH: fix #33771 (error_reporting falls to 0 when @ was used inside + try/catch block) + +* ZendEngine2/tests/bug33771.phpt + ZendEngine2/tests/bug33771.phpt: + + fix #33771 (error_reporting falls to 0 when @ was used inside try/catch + block) + +* ZendEngine2/zend_compile.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_execute.skl + ZendEngine2/zend_vm_opcodes.h: + fix #33771 (error_reporting falls to 0 when @ was used inside try/catch + block) + +* ext/oci8/oci8.c: + .. and the fix + +* ext/oci8/oci8.c: + fix Win32 builds for PHP_4_4 + (patch by Edin) + +2005-09-22 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_1) + configure.in + pear/Makefile.frag: + - Fixed bug #34583 (make install prematurely fails because of PEAR) + +2005-09-22 Antony Dovgal [EMAIL PROTECTED] + +* (RELEASE_1_1_1) + ext/oci8/package.xml: + prepare to release 1.1.1 + 2005-09-21 Marcus Boerger [EMAIL PROTECTED] * (PHP_5_1) @@ -12305,7 +12369,7 @@ * (PHP_4_3) ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2110 2005/09/22 05:44:27 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2111 2005/09/23 05:33:16 changelog Exp $ tag * (PHP_5_0) ext/standard/url_scanner_ex.c: @@ -15706,7 +15770,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.2110 2005/09/22 05:44:27 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.2111 2005/09/23 05:33:16 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -16187,7 +16251,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.2110 2005/09/22 05:44:27 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.2111 2005/09/23 05:33:16 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -17661,7 +17725,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2110 2005/09/22 05:44:27 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2111 2005/09/23 05:33:16 changelog Exp $ tag * ext/standard/credits_ext.h ext/standard/credits_sapi.h:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Fri Sep 23 01:33:26 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.777r2=1.778ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.777 ZendEngine2/ChangeLog:1.778 --- ZendEngine2/ChangeLog:1.777 Thu Sep 22 01:45:59 2005 +++ ZendEngine2/ChangeLog Fri Sep 23 01:33:26 2005 @@ -1,3 +1,33 @@ +2005-09-22 Antony Dovgal [EMAIL PROTECTED] + +* zend_modules.h + zend_modules.h: + bump API number + +* (PHP_5_1) + zend_compile.h + zend_vm_def.h + zend_vm_execute.h + zend_vm_execute.skl + zend_vm_opcodes.h + tests/bug33771.phpt: + MFH: fix #33771 (error_reporting falls to 0 when @ was used inside + try/catch block) + +* tests/bug33771.phpt + tests/bug33771.phpt: + + fix #33771 (error_reporting falls to 0 when @ was used inside try/catch + block) + +* zend_compile.h + zend_vm_def.h + zend_vm_execute.h + zend_vm_execute.skl + zend_vm_opcodes.h: + fix #33771 (error_reporting falls to 0 when @ was used inside try/catch + block) + 2005-09-21 Marcus Boerger [EMAIL PROTECTED] * (PHP_5_0) @@ -10371,7 +10401,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.777 2005/09/22 05:45:59 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.778 2005/09/23 05:33:26 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -12095,7 +12125,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.777 2005/09/22 05:45:59 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.778 2005/09/23 05:33:26 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_1) / configure.in /pear Makefile.frag
sniper Thu Sep 22 09:04:12 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcconfigure.in /php-src/pear Makefile.frag Log: - Fixed bug #34583 (make install prematurely fails because of PEAR) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.8r2=1.579.2.9ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.8 php-src/configure.in:1.579.2.9 --- php-src/configure.in:1.579.2.8 Tue Sep 13 17:40:46 2005 +++ php-src/configure.inThu Sep 22 09:04:10 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.8 2005/09/13 21:40:46 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.9 2005/09/22 13:04:10 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1181,7 +1181,7 @@ CXXFLAGS=$CXXFLAGS $standard_libtool_flag all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)' -install_targets=$install_modules $install_pear install-build install-headers install-programs +install_targets=$install_modules install-build install-headers install-programs $install_pear case $PHP_SAPI in cgi) http://cvs.php.net/diff.php/php-src/pear/Makefile.frag?r1=1.35.6.2r2=1.35.6.3ty=u Index: php-src/pear/Makefile.frag diff -u php-src/pear/Makefile.frag:1.35.6.2 php-src/pear/Makefile.frag:1.35.6.3 --- php-src/pear/Makefile.frag:1.35.6.2 Thu Sep 8 05:11:10 2005 +++ php-src/pear/Makefile.frag Thu Sep 22 09:04:12 2005 @@ -14,6 +14,5 @@ $(MAKE) -s install-pear-installer; \ else \ cat $(srcdir)/install-pear.txt; \ - exit 5; \ fi -- 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) /win32/build config.w32
edink Thu Sep 22 09:16:31 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/win32/buildconfig.w32
Log:
Fix building of extensions that inlcude extname/header.h
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.40.2.1r2=1.40.2.2ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.1
php-src/win32/build/config.w32:1.40.2.2
--- php-src/win32/build/config.w32:1.40.2.1 Fri Aug 12 16:08:14 2005
+++ php-src/win32/build/config.w32 Thu Sep 22 09:16:30 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.1 2005/08/12 20:08:14 wez Exp $
+// $Id: config.w32,v 1.40.2.2 2005/09/22 13:16:30 edink Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -73,7 +73,7 @@
}
DEFINE('PHP_PREFIX', PHP_PREFIX);
-DEFINE(BASE_INCLUDES, /I . /I main /I regex /I Zend /I TSRM );
+DEFINE(BASE_INCLUDES, /I . /I main /I regex /I Zend /I TSRM /I ext );
// CFLAGS for building the PHP dll
DEFINE(CFLAGS_PHP, /D _USRDLL /D PHP5DLLTS_EXPORTS /D PHP_EXPORTS \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
edink Thu Sep 22 09:18:14 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
MFB: Fix building of extensions that inlcude extname/header.h
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.47r2=1.48ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.47 php-src/win32/build/config.w32:1.48
--- php-src/win32/build/config.w32:1.47 Fri Aug 12 22:47:24 2005
+++ php-src/win32/build/config.w32 Thu Sep 22 09:18:14 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.47 2005/08/13 02:47:24 wez Exp $
+// $Id: config.w32,v 1.48 2005/09/22 13:18:14 edink Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -72,7 +72,7 @@
}
DEFINE('PHP_PREFIX', PHP_PREFIX);
-DEFINE(BASE_INCLUDES, /I . /I main /I regex /I Zend /I TSRM );
+DEFINE(BASE_INCLUDES, /I . /I main /I regex /I Zend /I TSRM /I ext );
// CFLAGS for building the PHP dll
DEFINE(CFLAGS_PHP, /D _USRDLL /D PHP5DLLTS_EXPORTS /D PHP_EXPORTS \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build config.w32
On Thu, 22 Sep 2005, Edin Kadribasic wrote: edink Thu Sep 22 09:18:14 2005 EDT Modified files: /php-src/win32/build config.w32 Log: MFB: Fix building of extensions that inlcude extname/header.h Wouldn't it be better to fix the extensions to include ext/ in their include path to the headers? This makes more sense IMO. Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: Failure
You got a new message. +++ Attachment: No Virus found +++ MC-Afee AntiVirus - www.mcafee.com -- 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) /ext/pdo_pgsql/tests bug_33876.phpt
iliaa Thu Sep 22 12:24:53 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_pgsql/testsbug_33876.phpt
Log:
Fixed test
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/tests/bug_33876.phpt?r1=1.1.2.2r2=1.1.2.3ty=u
Index: php-src/ext/pdo_pgsql/tests/bug_33876.phpt
diff -u php-src/ext/pdo_pgsql/tests/bug_33876.phpt:1.1.2.2
php-src/ext/pdo_pgsql/tests/bug_33876.phpt:1.1.2.3
--- php-src/ext/pdo_pgsql/tests/bug_33876.phpt:1.1.2.2 Mon Sep 19 20:35:21 2005
+++ php-src/ext/pdo_pgsql/tests/bug_33876.phpt Thu Sep 22 12:24:51 2005
@@ -3,7 +3,6 @@
--SKIPIF--
?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not
loaded');
-require 'ext/pdo_pgsql/tests/config.inc';
require 'ext/pdo/tests/pdo_test.inc';
PDOTest::skip();
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c
tony2001Thu Sep 22 16:14:19 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c
Log:
fix #32081 (mysqli_real_connect(): mysqli.default_socket in php.ini has no
effect) for real
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.119r2=1.120ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.119
php-src/ext/mysqli/mysqli_api.c:1.120
--- php-src/ext/mysqli/mysqli_api.c:1.119 Mon Aug 22 08:22:09 2005
+++ php-src/ext/mysqli/mysqli_api.c Thu Sep 22 16:14:15 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.119 2005/08/22 12:22:09 dmitry Exp $
+ $Id: mysqli_api.c,v 1.120 2005/09/22 20:14:15 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1360,6 +1360,10 @@
flags ^= CLIENT_LOCAL_FILES;
}
+ if (!socket) {
+ socket = MyG(default_socket);
+ }
+
if
(mysql_real_connect(mysql-mysql,hostname,username,passwd,dbname,port,socket,flags)
== NULL) {
php_mysqli_set_error(mysql_errno(mysql-mysql), (char *)
mysql_error(mysql-mysql) TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/mysqli mysqli_api.c
tony2001Thu Sep 22 16:14:26 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mysqli mysqli_api.c
Log:
MFH: fix #32081 (mysqli_real_connect(): mysqli.default_socket in php.ini has
no effect) for real
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.87.2.22r2=1.87.2.23ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.87.2.22
php-src/ext/mysqli/mysqli_api.c:1.87.2.23
--- php-src/ext/mysqli/mysqli_api.c:1.87.2.22 Fri Jun 17 12:37:07 2005
+++ php-src/ext/mysqli/mysqli_api.c Thu Sep 22 16:14:25 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.87.2.22 2005/06/17 16:37:07 georg Exp $
+ $Id: mysqli_api.c,v 1.87.2.23 2005/09/22 20:14:25 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1361,6 +1361,10 @@
flags ^= CLIENT_LOCAL_FILES;
}
+ if (!socket) {
+ socket = MyG(default_socket);
+ }
+
if
(mysql_real_connect(mysql-mysql,hostname,username,passwd,dbname,port,socket,flags)
== NULL) {
MYSQLI_REPORT_MYSQL_ERROR(mysql-mysql);
--
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) /ext/mysqli mysqli_api.c
tony2001Thu Sep 22 16:14:34 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysqli mysqli_api.c
Log:
MFH: fix #32081 (mysqli_real_connect(): mysqli.default_socket in php.ini has
no effect) for real
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.118r2=1.118.2.1ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118
php-src/ext/mysqli/mysqli_api.c:1.118.2.1
--- php-src/ext/mysqli/mysqli_api.c:1.118 Wed Aug 3 10:07:30 2005
+++ php-src/ext/mysqli/mysqli_api.c Thu Sep 22 16:14:34 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.118 2005/08/03 14:07:30 sniper Exp $
+ $Id: mysqli_api.c,v 1.118.2.1 2005/09/22 20:14:34 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1360,6 +1360,10 @@
flags ^= CLIENT_LOCAL_FILES;
}
+ if (!socket) {
+ socket = MyG(default_socket);
+ }
+
if
(mysql_real_connect(mysql-mysql,hostname,username,passwd,dbname,port,socket,flags)
== NULL) {
php_mysqli_set_error(mysql_errno(mysql-mysql), (char *)
mysql_error(mysql-mysql) TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
