[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Jun 14 01:32:26 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2013r2=1.2014ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2013 php-src/ChangeLog:1.2014 --- php-src/ChangeLog:1.2013Mon Jun 13 01:32:00 2005 +++ php-src/ChangeLog Tue Jun 14 01:32:25 2005 @@ -1,3 +1,88 @@ +2005-06-13 Hartmut Holzgraefe [EMAIL PROTECTED] + +* NEWS: + added news item for GLOB_ERR fix + +2005-06-13 Edin Kadribasic [EMAIL PROTECTED] + +* ext/bz2/bz2.c: + MFB: MSVC++ 6.0 doesn't support long long type + +* (PHP_4_4) + ext/bz2/bz2.c: + MSVC++ 6.0 doesn't support long long type + +2005-06-13 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/zend_execute.c + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_gen.php + ZendEngine2/zend_vm_opcodes.h: + Specializer optimization + +2005-06-13 Derick Rethans [EMAIL PROTECTED] + +* (PHP_4_4) + configure.in + main/php_version.h: + - Back to dev + +* (PHP_4_4) + NEWS + configure.in + main/php_version.h: + - Go with 4.4.0RC1. + +2005-06-13 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_4_4) + ext/standard/var_unserializer.c: + touch + +2005-06-13 Derick Rethans [EMAIL PROTECTED] + +* (PHP_4_4) + ext/standard/var_unserializer.re: + - MFH: Fixed bug with unserialize() with exotic letters in class names + +2005-06-13 Dmitry Stogov [EMAIL PROTECTED] + +* NEWS + ZendEngine2/zend.c + ZendEngine2/zend.h + ZendEngine2/zend_execute.c: + Fixed bug #33212 ([GCC 4]: 'zend_error_noreturn' aliased to external symbol + 'zend_error'). + The fix is not tested on Solaris and DARWIN! + +2005-06-13 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_4_4) + ext/oci8/oci8.c + ext/oci8/oci8.c: + MFH: + destroy session after destroying error handle + SQLT_CHR is allowed too + +* ext/oci8/oci8.c: + destroy session after destroying error handle + SQLT_CHR is allowed too + +2005-06-13 Jani Taskinen [EMAIL PROTECTED] + +* NEWS + acinclude.m4: + - Fixed bug #31256 (PHP_EVAL_LIBLINE configure macro does not handle + -pthread) + +2005-06-13 Dmitry Stogov [EMAIL PROTECTED] + +* NEWS + ZendEngine2/zend_reflection_api.c + ZendEngine2/tests/bug33312.phpt: + Fixed bug #33312 (ReflectionParameter methods do not work correctly) + 2005-06-12 Ilia Alshanetsky [EMAIL PROTECTED] * ext/standard/user_filters.c: @@ -4223,7 +4308,7 @@ * (PHP_4_3) ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2013 2005/06/13 05:32:00 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2014 2005/06/14 05:32:25 changelog Exp $ tag * (PHP_5_0) ext/standard/url_scanner_ex.c: @@ -7624,7 +7709,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.2013 2005/06/13 05:32:00 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.2014 2005/06/14 05:32:25 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -8105,7 +8190,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.2013 2005/06/13 05:32:00 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.2014 2005/06/14 05:32:25 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -9579,7 +9664,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2013 2005/06/13 05:32:00 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2014 2005/06/14 05:32:25 changelog Exp $ tag * ext/standard/credits_ext.h ext/standard/credits_sapi.h:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Jun 14 01:32:30 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.710r2=1.711ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.710 ZendEngine2/ChangeLog:1.711 --- ZendEngine2/ChangeLog:1.710 Sun Jun 12 01:40:34 2005 +++ ZendEngine2/ChangeLog Tue Jun 14 01:32:30 2005 @@ -1,3 +1,23 @@ +2005-06-13 Dmitry Stogov [EMAIL PROTECTED] + +* zend_execute.c + zend_vm_def.h + zend_vm_execute.h + zend_vm_gen.php + zend_vm_opcodes.h: + Specializer optimization + +* zend.c + zend.h + zend_execute.c: + Fixed bug #33212 ([GCC 4]: 'zend_error_noreturn' aliased to external symbol + 'zend_error'). + The fix is not tested on Solaris and DARWIN! + +* zend_reflection_api.c + tests/bug33312.phpt: + Fixed bug #33312 (ReflectionParameter methods do not work correctly) + 2005-06-11 Andi Gutmans [EMAIL PROTECTED] * zend.h: @@ -8561,7 +8581,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.710 2005/06/12 05:40:34 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.711 2005/06/14 05:32:30 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -10285,7 +10305,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.710 2005/06/12 05:40:34 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.711 2005/06/14 05:32:30 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php-src / NEWS configure.in /main php_version.h ZendEngine2 zend.h
On Sat, 11 Jun 2005, Andi Gutmans wrote: I can but I'd prefer to know what we're holding for. I am in no hurry to post it today, especially as it's the weekend and I have family to be with :) http://files.derickrethans.nl/ext-date.patch TODO: - Fix WS - Cleanup code - Make sure that everything is namespace protected - Fix one bug that prevent current testcases from working - Implement INI settings for timezone database and default timezone - Make sure the timezone database resource is installed properly. - Port over my 200 test cases to .phpt format. But that can be done during beta period, although I'd like the installation of the resource bundle be done before that as it's the most shaky part. 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
Re: [PHP-CVS] cvs: php-src /ext/iconv iconv.c
On Thu, 9 Jun 2005, Derick Rethans wrote: On Wed, 8 Jun 2005, Ilia Alshanetsky wrote: iliaa Wed Jun 8 19:49:40 2005 EDT Modified files: /php-src/ext/iconv iconv.c Log: Fixed bug #33268 (iconv_strlen() works only with a parameter of 3 in length) No merge to 4.4? Ilia? 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] cvs: php-src / NEWS acinclude.m4
sniper Mon Jun 13 04:44:48 2005 EDT Modified files: /php-srcNEWS acinclude.m4 Log: - Fixed bug #31256 (PHP_EVAL_LIBLINE configure macro does not handle -pthread) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1914r2=1.1915ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1914 php-src/NEWS:1.1915 --- php-src/NEWS:1.1914 Mon Jun 13 03:55:01 2005 +++ php-src/NEWSMon Jun 13 04:44:47 2005 @@ -1,14 +1,14 @@ PHPNEWS ||| -?? ??? 2005, PHP 5.1 -- Fixed bug #33312 (ReflectionParameter methods do not work correctly). - (Dmitry) - -11 Jun 2005, PHP 5.1 Beta 2 +?? Jun 2005, PHP 5.1 Beta 2 - Fixed PDO shutdown problem (possible inifite loop running rollback on shutdown). (Wez) - Fixed PECL bug #3714 (beginTransaction doesn't work if you're in auto-commit mode). (Wez) +- Fixed bug #33312 (ReflectionParameter methods do not work correctly). + (Dmitry) +- Fixed bug #31256 (PHP_EVAL_LIBLINE configure macro does not handle -pthread). + (Jani) 10 Jun 2005, PHP 5.1 Beta 1 - Upgraded PCRE library to version 5.0. (Andrei) http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.315r2=1.316ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.315 php-src/acinclude.m4:1.316 --- php-src/acinclude.m4:1.315 Tue Jun 7 12:47:32 2005 +++ php-src/acinclude.m4Mon Jun 13 04:44:47 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.315 2005/06/07 16:47:32 sniper Exp $ +dnl $Id: acinclude.m4,v 1.316 2005/06/13 08:44:47 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -390,6 +390,13 @@ AC_DEFUN([PHP_EVAL_LIBLINE],[ for ac_i in $1; do case $ac_i in +-pthread[)] + if test $ext_shared = yes; then +$2=[$]$2 -pthread + else +PHP_RUN_ONCE(EXTRA_LDFLAGS, [$ac_i], [EXTRA_LDFLAGS=$EXTRA_LDFLAGS $ac_i]) + fi +;; -l*[)] ac_ii=`echo $ac_i|cut -c 3-` PHP_ADD_LIBRARY($ac_ii,1,$2) -- 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/oci8 oci8.c
tony2001Mon Jun 13 05:31:04 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/oci8 oci8.c
Log:
MFH:
destroy session after destroying error handle
SQLT_CHR is allowed too
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.257.2.7r2=1.257.2.8ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.257.2.7 php-src/ext/oci8/oci8.c:1.257.2.8
--- php-src/ext/oci8/oci8.c:1.257.2.7 Thu Apr 28 10:12:23 2005
+++ php-src/ext/oci8/oci8.c Mon Jun 13 05:31:03 2005
@@ -22,7 +22,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.257.2.7 2005/04/28 14:12:23 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.257.2.8 2005/06/13 09:31:03 tony2001 Exp $ */
/* TODO list:
*
@@ -786,7 +786,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.257.2.7 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.257.2.8 $);
sprintf(buf, %ld, num_persistent);
php_info_print_table_row(2, Active Persistent Links, buf);
@@ -1016,6 +1016,15 @@
);
}
+ if (connection-pError) {
+ CALL_OCI(
+ OCIHandleFree(
+ (dvoid *) connection-pError,
+ (ub4) OCI_HTYPE_ERROR
+ )
+ );
+ }
+
if (connection-session connection-session-exclusive) {
/* close associated session when destructed */
zend_list_delete(connection-session-num);
@@ -1026,15 +1035,6 @@
efree(connection-descriptors);
}
- if (connection-pError) {
- CALL_OCI(
- OCIHandleFree(
- (dvoid *) connection-pError,
- (ub4) OCI_HTYPE_ERROR
- )
- );
- }
-
oci_debug(END _oci_conn_list_dtor: id=%d,connection-id);
efree(connection);
@@ -3695,6 +3695,8 @@
}
value_sz = sizeof(void*);
break;
+ case SQLT_CHR:
+ break;
default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown or
unsupported datatype given: %u, ocitype);
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 oci8.c
tony2001Mon Jun 13 05:30:52 2005 EDT
Modified files:
/php-src/ext/oci8 oci8.c
Log:
destroy session after destroying error handle
SQLT_CHR is allowed too
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.267r2=1.268ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.267 php-src/ext/oci8/oci8.c:1.268
--- php-src/ext/oci8/oci8.c:1.267 Thu Apr 28 10:10:42 2005
+++ php-src/ext/oci8/oci8.c Mon Jun 13 05:30:49 2005
@@ -22,7 +22,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.267 2005/04/28 14:10:42 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.268 2005/06/13 09:30:49 tony2001 Exp $ */
/* TODO list:
*
@@ -786,7 +786,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.267 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.268 $);
sprintf(buf, %ld, num_persistent);
php_info_print_table_row(2, Active Persistent Links, buf);
@@ -1015,6 +1015,15 @@
)
);
}
+
+ if (connection-pError) {
+ CALL_OCI(
+ OCIHandleFree(
+ (dvoid *) connection-pError,
+ (ub4) OCI_HTYPE_ERROR
+ )
+ );
+ }
if (connection-session connection-session-exclusive) {
/* close associated session when destructed */
@@ -1026,15 +1035,6 @@
efree(connection-descriptors);
}
- if (connection-pError) {
- CALL_OCI(
- OCIHandleFree(
- (dvoid *) connection-pError,
- (ub4) OCI_HTYPE_ERROR
- )
- );
- }
-
oci_debug(END _oci_conn_list_dtor: id=%d,connection-id);
efree(connection);
@@ -3694,6 +3694,8 @@
}
value_sz = sizeof(void*);
break;
+ case SQLT_CHR:
+ break;
default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown or
unsupported datatype given: %u, ocitype);
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_4_4) /ext/oci8 oci8.c
tony2001Mon Jun 13 05:38:00 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/oci8 oci8.c
Log:
MFH:
destroy session after destroying error handle
SQLT_CHR is allowed too
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.183.2.18r2=1.183.2.18.2.1ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.183.2.18
php-src/ext/oci8/oci8.c:1.183.2.18.2.1
--- php-src/ext/oci8/oci8.c:1.183.2.18 Thu Apr 28 10:13:08 2005
+++ php-src/ext/oci8/oci8.c Mon Jun 13 05:37:57 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.183.2.18 2005/04/28 14:13:08 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.183.2.18.2.1 2005/06/13 09:37:57 tony2001 Exp $ */
/* TODO list:
*
@@ -641,7 +641,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.183.2.18 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.183.2.18.2.1 $);
#ifndef PHP_WIN32
php_info_print_table_row(2, Oracle Version, PHP_OCI8_VERSION );
php_info_print_table_row(2, Compile-time ORACLE_HOME, PHP_OCI8_DIR );
@@ -836,18 +836,18 @@
(ub4) OCI_HTYPE_SVCCTX));
}
- if (connection-session connection-session-exclusive) {
- /* exclusive connection created via OCINLogon() close their
- associated session when destructed */
- zend_list_delete(connection-session-num);
- }
-
if (connection-pError) {
CALL_OCI(OCIHandleFree(
(dvoid *) connection-pError,
(ub4) OCI_HTYPE_ERROR));
}
+ if (connection-session connection-session-exclusive) {
+ /* exclusive connection created via OCINLogon() close their
+ associated session when destructed */
+ zend_list_delete(connection-session-num);
+ }
+
oci_debug(END _oci_conn_list_dtor: id=%d,connection-id);
efree(connection);
@@ -2975,6 +2975,8 @@
}
value_sz = sizeof(void*);
break;
+ case SQLT_CHR:
+ break;
default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown or
unsupported datatype given: %u, ocitype);
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_4_4) /ext/standard var_unserializer.re
derick Mon Jun 13 10:13:11 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard var_unserializer.re
Log:
- MFH: Fixed bug with unserialize() with exotic letters in class names
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.11.4.16r2=1.11.4.16.2.1ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.11.4.16
php-src/ext/standard/var_unserializer.re:1.11.4.16.2.1
--- php-src/ext/standard/var_unserializer.re:1.11.4.16 Wed Mar 9 21:00:17 2005
+++ php-src/ext/standard/var_unserializer.reMon Jun 13 10:13:11 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: var_unserializer.re,v 1.11.4.16 2005/03/10 02:00:17 helly Exp $ */
+/* $Id: var_unserializer.re,v 1.11.4.16.2.1 2005/06/13 14:13:11 derick Exp $ */
#include php.h
#include ext/standard/php_var.h
@@ -528,7 +528,7 @@
class_name = str_tolower_copy((char *)emalloc(len+1), class_name, len);
class_name[len] = '\0';
- len3 = strspn(class_name, 0123456789_abcdefghijklmnopqrstuvwxyz);
+ len3 = strspn(class_name,
0123456789_abcdefghijklmnopqrstuvwxyz\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377);
if (len3 != len)
{
*p = YYCURSOR + len3 - len;
--
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) / NEWS configure.in /main php_version.h
derick Mon Jun 13 10:23:35 2005 EDT Modified files: (Branch: PHP_4_4) /php-srcNEWS configure.in /php-src/main php_version.h Log: - Go with 4.4.0RC1. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.4r2=1.1247.2.920.2.5ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.4 php-src/NEWS:1.1247.2.920.2.5 --- php-src/NEWS:1.1247.2.920.2.4 Tue Jun 7 05:57:44 2005 +++ php-src/NEWSMon Jun 13 10:23:33 2005 @@ -1,6 +1,6 @@ PHP 4 NEWS ||| -?? ??? 2005, Version 4.4.0 +13 Jun 2005, Version 4.4.0 RC1 - Added man pages for phpize and php-config scripts. (Jakub Vrana) - Added support for .cc files in extensions. (Brian) - Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.164.2.3r2=1.396.2.164.2.4ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.3 php-src/configure.in:1.396.2.164.2.4 --- php-src/configure.in:1.396.2.164.2.3Tue Jun 7 13:23:12 2005 +++ php-src/configure.inMon Jun 13 10:23:34 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.3 2005/06/07 17:23:12 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.4 2005/06/13 14:23:34 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=4 MINOR_VERSION=4 RELEASE_VERSION=0 -EXTRA_VERSION=-dev +EXTRA_VERSION=RC1 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.66.2.81.2.1r2=1.66.2.81.2.2ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.81.2.1 php-src/main/php_version.h:1.66.2.81.2.2 --- php-src/main/php_version.h:1.66.2.81.2.1Mon Jun 6 05:23:58 2005 +++ php-src/main/php_version.h Mon Jun 13 10:23:34 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 4.4.0-dev +#define PHP_EXTRA_VERSION RC1 +#define PHP_VERSION 4.4.0RC1 -- 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/bz2 bz2.c
edink Mon Jun 13 15:32:15 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/bz2bz2.c
Log:
MSVC++ 6.0 doesn't support long long type
http://cvs.php.net/diff.php/php-src/ext/bz2/bz2.c?r1=1.1.2.4.2.3r2=1.1.2.4.2.4ty=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.1.2.4.2.3 php-src/ext/bz2/bz2.c:1.1.2.4.2.4
--- php-src/ext/bz2/bz2.c:1.1.2.4.2.3 Thu Jun 9 12:13:34 2005
+++ php-src/ext/bz2/bz2.c Mon Jun 13 15:32:15 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bz2.c,v 1.1.2.4.2.3 2005/06/09 16:13:34 iliaa Exp $ */
+/* $Id: bz2.c,v 1.1.2.4.2.4 2005/06/13 19:32:15 edink Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -434,7 +434,11 @@
char *source, *dest;
int source_len, error;
long small = 0;
+#if defined(PHP_WIN32) _MSC_VER 1300
+ unsigned __int64 size = 0;
+#else
unsigned long long size = 0;
+#endif
bz_stream bzs;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|l,
source, source_len, small)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
hholzgraMon Jun 13 18:20:07 2005 EDT Modified files: /php-srcNEWS Log: added news item for GLOB_ERR fix http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1916r2=1.1917ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1916 php-src/NEWS:1.1917 --- php-src/NEWS:1.1916 Mon Jun 13 07:22:58 2005 +++ php-src/NEWSMon Jun 13 18:20:05 2005 @@ -11,6 +11,7 @@ 'zend_error'). (Dmitry) - Fixed bug #31256 (PHP_EVAL_LIBLINE configure macro does not handle -pthread). (Jani) +- Fixed bug #28355 (glob wont error if dir is not readable). (Hartmut) 10 Jun 2005, PHP 5.1 Beta 1 - Upgraded PCRE library to version 5.0. (Andrei) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_mysql config.m4
sniper Mon Jun 13 19:37:21 2005 EDT Modified files: /php-src/ext/pdo_mysql config.m4 Log: ws http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.20r2=1.21ty=u Index: php-src/ext/pdo_mysql/config.m4 diff -u php-src/ext/pdo_mysql/config.m4:1.20 php-src/ext/pdo_mysql/config.m4:1.21 --- php-src/ext/pdo_mysql/config.m4:1.20Sun May 29 19:16:43 2005 +++ php-src/ext/pdo_mysql/config.m4 Mon Jun 13 19:37:20 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.20 2005/05/29 23:16:43 sniper Exp $ +dnl $Id: config.m4,v 1.21 2005/06/13 23:37:20 sniper Exp $ dnl if test $PHP_PDO != no; then @@ -21,21 +21,21 @@ AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) for i in $PHP_PDO_MYSQL /usr/local /usr ; do - PDO_MYSQL_DIR=$i - PDO_MYSQL_CONFIG=$PDO_MYSQL_DIR/bin/mysql_config - if test -r $i/include/mysql; then - PDO_MYSQL_INC_DIR=$i/include/mysql - else - PDO_MYSQL_INC_DIR=$i/include - fi - if test -r $i/lib/mysql; then -PDO_MYSQL_LIB_DIR=$i/lib/mysql - else -PDO_MYSQL_LIB_DIR=$i/lib - fi - if test -x $PDO_MYSQL_CONFIG; then -break - fi +PDO_MYSQL_DIR=$i +PDO_MYSQL_CONFIG=$PDO_MYSQL_DIR/bin/mysql_config +if test -r $i/include/mysql; then + PDO_MYSQL_INC_DIR=$i/include/mysql +else + PDO_MYSQL_INC_DIR=$i/include +fi +if test -r $i/lib/mysql; then + PDO_MYSQL_LIB_DIR=$i/lib/mysql +else + PDO_MYSQL_LIB_DIR=$i/lib +fi +if test -x $PDO_MYSQL_CONFIG; then + break +fi done if test -z $PDO_MYSQL_DIR; then @@ -52,8 +52,8 @@ PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $PDO_MYSQL_LIB_DIR, PDO_MYSQL_SHARED_LIBADD) PHP_ADD_INCLUDE($PDO_MYSQL_INC_DIR) if test -x $PDO_MYSQL_CONFIG; then - PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs` - PHP_SUBST_OLD(PDO_MYSQL_LIBS) +PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs` +PHP_SUBST_OLD(PDO_MYSQL_LIBS) fi _SAVE_LDFLAGS=$LDFLAGS -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4 /ext/pdo_firebird config.m4 /ext/pdo_mysql config.m4 /ext/pdo_oci config.m4 /ext/pdo_odbc config.m4 /ext/pdo_pgsql config.m4 /ext/pdo_sqlite config.m4
sniper Mon Jun 13 20:00:53 2005 EDT Modified files: /php-srcacinclude.m4 /php-src/ext/pdo_firebird config.m4 /php-src/ext/pdo_mysql config.m4 /php-src/ext/pdo_ociconfig.m4 /php-src/ext/pdo_odbc config.m4 /php-src/ext/pdo_pgsql config.m4 /php-src/ext/pdo_sqlite config.m4 Log: - Added PHP_CHECK_PDO_INCLUDES macro (caches the result) http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.316r2=1.317ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.316 php-src/acinclude.m4:1.317 --- php-src/acinclude.m4:1.316 Mon Jun 13 04:44:47 2005 +++ php-src/acinclude.m4Mon Jun 13 20:00:51 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.316 2005/06/13 08:44:47 sniper Exp $ +dnl $Id: acinclude.m4,v 1.317 2005/06/14 00:00:51 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2469,3 +2469,21 @@ AC_MSG_CHECKING([which regex library to use]) AC_MSG_RESULT([$REGEX_TYPE]) ]) + +dnl +dnl PHP_CHECK_PDO_INCLUDES +dnl +AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[ + AC_CACHE_CHECK([for PDO includes], pdo_inc_path, [ +AC_MSG_CHECKING([for PDO includes]) +if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$abs_srcdir/ext +elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$abs_srcdir/ext +elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$prefix/include/php/ext +else + AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) +fi + ]) +]) http://cvs.php.net/diff.php/php-src/ext/pdo_firebird/config.m4?r1=1.7r2=1.8ty=u Index: php-src/ext/pdo_firebird/config.m4 diff -u php-src/ext/pdo_firebird/config.m4:1.7 php-src/ext/pdo_firebird/config.m4:1.8 --- php-src/ext/pdo_firebird/config.m4:1.7 Sun May 29 19:16:43 2005 +++ php-src/ext/pdo_firebird/config.m4 Mon Jun 13 20:00:52 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.7 2005/05/29 23:16:43 sniper Exp $ +dnl $Id: config.m4,v 1.8 2005/06/14 00:00:52 sniper Exp $ dnl if test $PHP_PDO != no; then @@ -40,18 +40,8 @@ -L$FIREBIRD_LIBDIR ]) - AC_MSG_CHECKING([for PDO includes]) - if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then -pdo_inc_path=$abs_srcdir/ext - elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -pdo_inc_path=$abs_srcdir/ext - elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then -pdo_inc_path=$prefix/include/php/ext - else -AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) - fi - AC_MSG_RESULT($pdo_inc_path) - + PHP_CHECK_PDO_INCLUDES + PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD) PHP_ADD_INCLUDE($FIREBIRD_INCDIR) AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ]) http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.21r2=1.22ty=u Index: php-src/ext/pdo_mysql/config.m4 diff -u php-src/ext/pdo_mysql/config.m4:1.21 php-src/ext/pdo_mysql/config.m4:1.22 --- php-src/ext/pdo_mysql/config.m4:1.21Mon Jun 13 19:37:20 2005 +++ php-src/ext/pdo_mysql/config.m4 Mon Jun 13 20:00:53 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.21 2005/06/13 23:37:20 sniper Exp $ +dnl $Id: config.m4,v 1.22 2005/06/14 00:00:53 sniper Exp $ dnl if test $PHP_PDO != no; then @@ -61,17 +61,7 @@ AC_CHECK_FUNCS([mysql_commit mysql_stmt_prepare]) LDFLAGS=$_SAVE_LDFLAGS - AC_MSG_CHECKING([for PDO includes]) - if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then -pdo_inc_path=$abs_srcdir/ext - elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -pdo_inc_path=$abs_srcdir/ext - elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then -pdo_inc_path=$prefix/include/php/ext - else -AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) - fi - AC_MSG_RESULT($pdo_inc_path) + PHP_CHECK_PDO_INCLUDES PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_inc_path) PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo) http://cvs.php.net/diff.php/php-src/ext/pdo_oci/config.m4?r1=1.12r2=1.13ty=u Index: php-src/ext/pdo_oci/config.m4 diff -u php-src/ext/pdo_oci/config.m4:1.12 php-src/ext/pdo_oci/config.m4:1.13 --- php-src/ext/pdo_oci/config.m4:1.12 Sun May 29 19:16:43 2005 +++ php-src/ext/pdo_oci/config.m4 Mon Jun 13 20:00:53 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.12 2005/05/29 23:16:43 sniper Exp $ +dnl $Id: config.m4,v 1.13 2005/06/14 00:00:53 sniper Exp $ if test $PHP_PDO != no; then @@ -160,17 +160,7 @@ -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD ]) - AC_MSG_CHECKING([for PDO includes]) - if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then -pdo_inc_path=$abs_srcdir/ext - elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -pdo_inc_path=$abs_srcdir/ext - elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then -pdo_inc_path=$prefix/include/php/ext
[PHP-CVS] cvs: php-src /ext/pdo_odbc config.m4
sniper Mon Jun 13 21:42:31 2005 EDT Modified files: /php-src/ext/pdo_odbc config.m4 Log: - Fixed some places which might cause problems - Changed the general flavour to have libname parameter (given without the lib prefix of course) # bug #33316 should be fixed now too http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/config.m4?r1=1.18r2=1.19ty=u Index: php-src/ext/pdo_odbc/config.m4 diff -u php-src/ext/pdo_odbc/config.m4:1.18 php-src/ext/pdo_odbc/config.m4:1.19 --- php-src/ext/pdo_odbc/config.m4:1.18 Mon Jun 13 20:00:53 2005 +++ php-src/ext/pdo_odbc/config.m4 Mon Jun 13 21:42:31 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.18 2005/06/14 00:00:53 sniper Exp $ +dnl $Id: config.m4,v 1.19 2005/06/14 01:42:31 sniper Exp $ dnl config.m4 for extension pdo_odbc dnl vim:et:sw=2:ts=2: @@ -13,7 +13,7 @@ will check for unixODBC under /usr/local. You may attempt to use an otherwise unsupported driver using the \generic\ flavour. The syntax for generic ODBC support is: - --with-pdo-odbc=generic,dir,ldflags,cflags + --with-pdo-odbc=generic,dir,libname,ldflags,cflags This extension will always be created as a shared extension named pdo_odbc.so]]) @@ -21,13 +21,41 @@ [ --with-pdo-odbc=flavour,dir PDO: Support for 'flavour' ODBC driver.]PDO_ODBC_HELP_TEXT) -AC_DEFUN([PDO_ODBC_CHECK_HEADER],[ - if test -f $PDO_ODBC_INCDIR/$1 ; then -AC_DEFINE([HAVE_]translit($1,a-z_.-,A-Z___), 1, [ ]) +AC_DEFUN([PDO_ODBC_CHECK_HEADERS],[ + php_pdo_have_header=no + for i in odbc.h \ + odbcsdk.h \ + iodbc.h \ + sqlunix.h \ + sqltypes.h \ + sqlucode.h \ + sql.h \ + isql.h \ + sqlext.h \ + isqlext.h \ + udbcext.h \ + sqlcli1.h \ + LibraryManager.h \ + cli0core.h \ + cli0ext.h \ + cli0cli.h \ + cli0defs.h \ + cli0env.h + do +if test -f $PDO_ODBC_INCDIR/$i; then + php_pdo_have_header=yes + PHP_DEF_HAVE([$i]) +fi + done + if test $php_pdo_have_header = no; then +AC_MSG_ERROR([Cannot find any header file(s)!]) fi ]) if test $PHP_PDO_ODBC != no; then + + PHP_CHECK_PDO_INCLUDES + AC_MSG_CHECKING([for selected PDO ODBC flavour]) pdo_odbc_flavour=`echo $PHP_PDO_ODBC | cut -d, -f1` @@ -41,24 +69,25 @@ ibm-db2) pdo_odbc_def_libdir=/home/db2inst1/sqllib/lib pdo_odbc_def_incdir=/home/db2inst1/sqllib/include -pdo_odbc_def_lib=-ldb2 +pdo_odbc_def_lib=db2 ;; unixODBC|unixodbc) pdo_odbc_def_libdir=/usr/local/lib pdo_odbc_def_incdir=/usr/local/include -pdo_odbc_def_lib=-lodbc +pdo_odbc_def_lib=odbc ;; ODBCRouter|odbcrouter) pdo_odbc_def_libdir=/usr/lib pdo_odbc_def_incdir=/usr/include -pdo_odbc_def_lib=-lodbcsdk +pdo_odbc_def_lib=odbcsdk ;; generic) pdo_odbc_def_lib=`echo $PHP_PDO_ODBC | cut -d, -f3` -pdo_odbc_def_cflags=`echo $PHP_PDO_ODBC | cut -d, -f4` +pdo_odbc_def_ldflags=`echo $PHP_PDO_ODBC | cut -d, -f4` +pdo_odbc_def_cflags=`echo $PHP_PDO_ODBC | cut -d, -f5` pdo_odbc_flavour=$pdo_odbc_flavour ($pdo_odbc_def_lib) ;; @@ -83,53 +112,32 @@ AC_MSG_WARN([library dir $PDO_ODBC_LIBDIR does not exist]) fi - dnl yick time - PDO_ODBC_CHECK_HEADER(odbc.h) - PDO_ODBC_CHECK_HEADER(odbcsdk.h) - PDO_ODBC_CHECK_HEADER(iodbc.h) - PDO_ODBC_CHECK_HEADER(sqlunix.h) - PDO_ODBC_CHECK_HEADER(sqltypes.h) - PDO_ODBC_CHECK_HEADER(sqlucode.h) - PDO_ODBC_CHECK_HEADER(sql.h) - PDO_ODBC_CHECK_HEADER(isql.h) - PDO_ODBC_CHECK_HEADER(sqlext.h) - PDO_ODBC_CHECK_HEADER(isqlext.h) - PDO_ODBC_CHECK_HEADER(udbcext.h) - PDO_ODBC_CHECK_HEADER(sqlcli1.h) - PDO_ODBC_CHECK_HEADER(LibraryManager.h) - PDO_ODBC_CHECK_HEADER(cli0core.h) - PDO_ODBC_CHECK_HEADER(cli0ext.h) - PDO_ODBC_CHECK_HEADER(cli0cli.h) - PDO_ODBC_CHECK_HEADER(cli0defs.h) - PDO_ODBC_CHECK_HEADER(cli0env.h) - - PDO_ODBC_INCLUDE=$pdo_odbc_def_cflags -I$PDO_ODBC_INCDIR -DPDO_ODBC_TYPE=\\\$pdo_odbc_flavour\\\ - PDO_ODBC_LFLAGS=-L$PDO_ODBC_LIBDIR - PDO_ODBC_LIBS=$pdo_odbc_def_lib - - save_old_LDFLAGS=$LDFLAGS - LDFLAGS=$PDO_ODBC_LFLAGS $PDO_ODBC_LIBS -lm -ldl - dnl Check for an ODBC 1.0 function to assert that the libraries work - AC_TRY_LINK_FUNC([SQLBindCol],[],[ -AC_MSG_ERROR([[Your ODBC library does not exist]]) - ]) - dnl And now check for an ODBC 3.0 function to assert that they're - dnl *good* libraries. - AC_TRY_LINK_FUNC([SQLAllocHandle],[],[ -AC_MSG_ERROR([[ + PDO_ODBC_CHECK_HEADERS + +
[PHP-CVS] cvs: php-src / acinclude.m4
sniper Mon Jun 13 21:43:53 2005 EDT Modified files: /php-srcacinclude.m4 Log: Allow different things to be done when found / not-found http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.317r2=1.318ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.317 php-src/acinclude.m4:1.318 --- php-src/acinclude.m4:1.317 Mon Jun 13 20:00:51 2005 +++ php-src/acinclude.m4Mon Jun 13 21:43:53 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.317 2005/06/14 00:00:51 sniper Exp $ +dnl $Id: acinclude.m4,v 1.318 2005/06/14 01:43:53 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2471,7 +2471,7 @@ ]) dnl -dnl PHP_CHECK_PDO_INCLUDES +dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]]) dnl AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[ AC_CACHE_CHECK([for PDO includes], pdo_inc_path, [ @@ -2482,8 +2482,11 @@ pdo_inc_path=$abs_srcdir/ext elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$prefix/include/php/ext -else - AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) fi ]) + if test -n $pdo_inc_path; then +ifelse([$1],[],:,[$1]) + else +ifelse([$2],[],[AC_MSG_ERROR([Cannot find php_pdo_driver.h.])],[$2]) + fi ]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_odbc config.m4
sniper Mon Jun 13 22:18:18 2005 EDT Modified files: /php-src/ext/pdo_odbc config.m4 Log: Partial revert: AC_DEFINE / PHP_HAVE_DEF need to be called once only per macro http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/config.m4?r1=1.19r2=1.20ty=u Index: php-src/ext/pdo_odbc/config.m4 diff -u php-src/ext/pdo_odbc/config.m4:1.19 php-src/ext/pdo_odbc/config.m4:1.20 --- php-src/ext/pdo_odbc/config.m4:1.19 Mon Jun 13 21:42:31 2005 +++ php-src/ext/pdo_odbc/config.m4 Mon Jun 13 22:18:18 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.19 2005/06/14 01:42:31 sniper Exp $ +dnl $Id: config.m4,v 1.20 2005/06/14 02:18:18 sniper Exp $ dnl config.m4 for extension pdo_odbc dnl vim:et:sw=2:ts=2: @@ -21,34 +21,11 @@ [ --with-pdo-odbc=flavour,dir PDO: Support for 'flavour' ODBC driver.]PDO_ODBC_HELP_TEXT) -AC_DEFUN([PDO_ODBC_CHECK_HEADERS],[ - php_pdo_have_header=no - for i in odbc.h \ - odbcsdk.h \ - iodbc.h \ - sqlunix.h \ - sqltypes.h \ - sqlucode.h \ - sql.h \ - isql.h \ - sqlext.h \ - isqlext.h \ - udbcext.h \ - sqlcli1.h \ - LibraryManager.h \ - cli0core.h \ - cli0ext.h \ - cli0cli.h \ - cli0defs.h \ - cli0env.h - do -if test -f $PDO_ODBC_INCDIR/$i; then - php_pdo_have_header=yes - PHP_DEF_HAVE([$i]) -fi - done - if test $php_pdo_have_header = no; then -AC_MSG_ERROR([Cannot find any header file(s)!]) + +AC_DEFUN([PDO_ODBC_CHECK_HEADER],[ + if test -f $PDO_ODBC_INCDIR/$1; then +php_pdo_have_header=yes +PHP_DEF_HAVE($1) fi ]) @@ -108,13 +85,34 @@ libs $PDO_ODBC_LIBDIR, headers$PDO_ODBC_INCDIR]) - if ! test -d $PDO_ODBC_LIBDIR ; then + if test ! -d $PDO_ODBC_LIBDIR ; then AC_MSG_WARN([library dir $PDO_ODBC_LIBDIR does not exist]) fi - PDO_ODBC_CHECK_HEADERS + PDO_ODBC_CHECK_HEADER(odbc.h) + PDO_ODBC_CHECK_HEADER(odbcsdk.h) + PDO_ODBC_CHECK_HEADER(iodbc.h) + PDO_ODBC_CHECK_HEADER(sqlunix.h) + PDO_ODBC_CHECK_HEADER(sqltypes.h) + PDO_ODBC_CHECK_HEADER(sqlucode.h) + PDO_ODBC_CHECK_HEADER(sql.h) + PDO_ODBC_CHECK_HEADER(isql.h) + PDO_ODBC_CHECK_HEADER(sqlext.h) + PDO_ODBC_CHECK_HEADER(isqlext.h) + PDO_ODBC_CHECK_HEADER(udbcext.h) + PDO_ODBC_CHECK_HEADER(sqlcli1.h) + PDO_ODBC_CHECK_HEADER(LibraryManager.h) + PDO_ODBC_CHECK_HEADER(cli0core.h) + PDO_ODBC_CHECK_HEADER(cli0ext.h) + PDO_ODBC_CHECK_HEADER(cli0cli.h) + PDO_ODBC_CHECK_HEADER(cli0defs.h) + PDO_ODBC_CHECK_HEADER(cli0env.h) + + if test $php_pdo_have_header != yes; then +AC_MSG_ERROR([Cannot find header file(s) for pdo_odbc]) + fi - PDO_ODBC_INCLUDE=$pdo_odbc_def_cflags -I$PDO_ODBC_INCDIR -DPDO_ODBC_TYPE=\\$pdo_odbc_flavour\\ + PDO_ODBC_INCLUDE=$pdo_odbc_def_cflags -I$PDO_ODBC_INCDIR -DPDO_ODBC_TYPE=\\\$pdo_odbc_flavour\\\ PDO_ODBC_LDFLAGS=$pdo_odbc_def_ldflags -L$PDO_ODBC_LIBDIR -l$pdo_odbc_def_lib PHP_EVAL_LIBLINE([$PDO_ODBC_LDFLAGS], [PDO_ODBC_SHARED_LIBADD]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4
sniper Mon Jun 13 22:18:44 2005 EDT Modified files: /php-srcacinclude.m4 Log: Make this usable for header files too http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.318r2=1.319ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.318 php-src/acinclude.m4:1.319 --- php-src/acinclude.m4:1.318 Mon Jun 13 21:43:53 2005 +++ php-src/acinclude.m4Mon Jun 13 22:18:44 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.318 2005/06/14 01:43:53 sniper Exp $ +dnl $Id: acinclude.m4,v 1.319 2005/06/14 02:18:44 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -38,7 +38,7 @@ dnl dnl Generates 'AC_DEFINE(HAVE_WHAT, 1, [ ])' dnl -AC_DEFUN([PHP_DEF_HAVE],[AC_DEFINE([HAVE_]translit($1,a-z_-,A-Z__), 1, [ ])]) +AC_DEFUN([PHP_DEF_HAVE],[AC_DEFINE([HAVE_]translit($1,a-z_.-,A-Z___), 1, [ ])]) dnl dnl PHP_RUN_ONCE(namespace, variable, code) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/ftp ftp.c /main network.c php_network.h /main/streams xp_socket.c
iliaa Mon Jun 13 22:39:43 2005 EDT
Modified files:
/php-src/main network.c php_network.h
/php-src/main/streams xp_socket.c
/php-src/ext/ftpftp.c
/php-srcNEWS
Log:
Added bindto socket context option.
http://cvs.php.net/diff.php/php-src/main/network.c?r1=1.114r2=1.115ty=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.114 php-src/main/network.c:1.115
--- php-src/main/network.c:1.114Wed Oct 6 09:22:21 2004
+++ php-src/main/network.c Mon Jun 13 22:39:42 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.114 2004/10/06 13:22:21 hyanantha Exp $ */
+/* $Id: network.c,v 1.115 2005/06/14 02:39:42 iliaa Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -722,7 +722,7 @@
/* {{{ php_network_connect_socket_to_host */
php_socket_t php_network_connect_socket_to_host(const char *host, unsigned
short port,
int socktype, int asynchronous, struct timeval *timeout, char
**error_string,
- int *error_code
+ int *error_code, char *bindto, unsigned short bindport
TSRMLS_DC)
{
int num_addrs, n, fatal = 0;
@@ -785,7 +785,39 @@
if (sa) {
/* make a connection attempt */
+
+ if (bindto) {
+ struct sockaddr local_address;
+ if (sa-sa_family == AF_INET) {
+ struct sockaddr_in *in4 = (struct
sockaddr_in*)local_address;
+
+ in4-sin_family = sa-sa_family;
+ in4-sin_port = htons(bindport);
+ if (!inet_aton(bindto, in4-sin_addr))
{
+ goto bad_ip;
+ }
+ bzero((in4-sin_zero), 8);
+ }
+#if HAVE_IPV6 HAVE_INET_PTON
+else { /* IPV6 */
+ struct sockaddr_in6 *in6 = (struct
sockaddr_in6*)local_address;
+
+ in6-sin6_family = sa-sa_family;
+ in6-sin6_port = htons(bindport);
+ if (inet_pton(AF_INET6, bindto,
in6-sin6_addr) 1) {
+ goto bad_ip;
+ }
+ }
+#endif
+ if (bind(sock, local_address, sizeof(struct
sockaddr))) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, failed to bind to '%s:%d', system said: %s, bindto, bindport,
strerror(errno));
+ }
+ goto bind_done;
+bad_ip:
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
Invalid IP Address: %s, bindto);
+ }
+bind_done:
n = php_network_connect_socket(sock, sa, socklen,
asynchronous,
timeout ? working_timeout : NULL,
error_string, error_code);
http://cvs.php.net/diff.php/php-src/main/php_network.h?r1=1.53r2=1.54ty=u
Index: php-src/main/php_network.h
diff -u php-src/main/php_network.h:1.53 php-src/main/php_network.h:1.54
--- php-src/main/php_network.h:1.53 Fri Sep 17 08:44:56 2004
+++ php-src/main/php_network.h Mon Jun 13 22:39:42 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_network.h,v 1.53 2004/09/17 12:44:56 wez Exp $ */
+/* $Id: php_network.h,v 1.54 2005/06/14 02:39:42 iliaa Exp $ */
#ifndef _PHP_NETWORK_H
#define _PHP_NETWORK_H
@@ -223,7 +223,7 @@
BEGIN_EXTERN_C()
PHPAPI php_socket_t php_network_connect_socket_to_host(const char *host,
unsigned short port,
int socktype, int asynchronous, struct timeval *timeout, char
**error_string,
- int *error_code
+ int *error_code, char *bindto, unsigned short bindport
TSRMLS_DC);
PHPAPI int php_network_connect_socket(php_socket_t sockfd,
http://cvs.php.net/diff.php/php-src/main/streams/xp_socket.c?r1=1.30r2=1.31ty=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.30
php-src/main/streams/xp_socket.c:1.31
--- php-src/main/streams/xp_socket.c:1.30 Fri Sep 17 10:36:55 2004
+++ php-src/main/streams/xp_socket.cMon Jun 13 22:39:42 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.30 2004/09/17 14:36:55 wez Exp $ */
+/* $Id: xp_socket.c,v
[PHP-CVS] cvs: php-src /main/streams xp_socket.c
sebastian Tue Jun 14 01:13:02 2005 EDT
Modified files:
/php-src/main/streams xp_socket.c
Log:
ZTS fix.
http://cvs.php.net/diff.php/php-src/main/streams/xp_socket.c?r1=1.31r2=1.32ty=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.31
php-src/main/streams/xp_socket.c:1.32
--- php-src/main/streams/xp_socket.c:1.31 Mon Jun 13 22:39:42 2005
+++ php-src/main/streams/xp_socket.cTue Jun 14 01:13:01 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.31 2005/06/14 02:39:42 iliaa Exp $ */
+/* $Id: xp_socket.c,v 1.32 2005/06/14 05:13:01 sebastian Exp $ */
#include php.h
#include ext/standard/file.h
@@ -525,7 +525,7 @@
static inline char *parse_ip_address(php_stream_xport_param *xparam, int
*portno TSRMLS_DC)
{
- return parse_ip_address_ex(xparam-inputs.name, xparam-inputs.namelen,
portno, xparam-want_errortext, xparam-outputs.error_text);
+ return parse_ip_address_ex(xparam-inputs.name, xparam-inputs.namelen,
portno, xparam-want_errortext, xparam-outputs.error_text TSRMLS_CC);
}
static inline int php_tcp_sockop_bind(php_stream *stream, php_netstream_data_t
*sock,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
