[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Nov 28 01:42:37 2005 EDT
Modified files:
/php-srcChangeLog
Log:
ChangeLog update
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2177r2=1.2178ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2177 php-src/ChangeLog:1.2178
--- php-src/ChangeLog:1.2177Sun Nov 27 01:47:40 2005
+++ php-src/ChangeLog Mon Nov 28 01:42:31 2005
@@ -1,3 +1,124 @@
+2005-11-27 Jani Taskinen [EMAIL PROTECTED]
+
+* (PHP_5_1)
+ ext/ming/config.m4:
+ - Fixed wrong usage of AC_TRY_COMPILE() macro
+
+2005-11-27 Wez Furlong [EMAIL PROTECTED]
+
+* (PHP_5_1)
+ NEWS:
+ BFN
+
+2005-11-27 Antony Dovgal [EMAIL PROTECTED]
+
+* (PHP_5_1)
+ NEWS:
+ MFH: fix #35430 (PDO crashes on incorrect FETCH_FUNC use)
+
+2005-11-27 Jani Taskinen [EMAIL PROTECTED]
+
+* ext/curl/interface.c:
+ MF51: improve open_basedir check
+
+2005-11-27 Ilia Alshanetsky [EMAIL PROTECTED]
+
+* (PHP_5_1)
+ ext/curl/interface.c:
+ Improved safe_mode/open_basedir check.
+
+* (PHP_5_1)
+ configure.in
+ main/php_version.h:
+ Back to dev
+
+2005-11-27 Jani Taskinen [EMAIL PROTECTED]
+
+* (PHP_5_1)
+ NEWS:
+ Back from future
+
+2005-11-27 Ilia Alshanetsky [EMAIL PROTECTED]
+
+* (PHP_5_1)
+ UPGRADING:
+ removed no longer relevant portion.
+
+* (PHP_5_1)
+ NEWS:
+ Adjust news
+
+* (PHP_5_1)
+ NEWS
+ configure.in
+ main/php_version.h:
+ 5.1.1
+
+2005-11-27 Jani Taskinen [EMAIL PROTECTED]
+
+* (PHP_5_1)
+ NEWS:
+ fix news
+
+2005-11-27 Marcus Boerger [EMAIL PROTECTED]
+
+* (PHP_5_1)
+ NEWS:
+ - BFN
+
+2005-11-27 Rob Richards [EMAIL PROTECTED]
+
+* (PHP_5_1)
+ NEWS:
+ BFN
+
+* ext/com_dotnet/com_handlers.c
+ ext/com_dotnet/com_misc.c
+ ext/com_dotnet/com_saproxy.c
+ ext/com_dotnet/com_variant.c
+ ext/com_dotnet/php_com_dotnet_internal.h:
+ Fixed bug #35316 (Application exception trying to create COM object)
+ Fix some handler signatures causing memory corruption
+ Various unicode fixes
+
+* (PHP_5_1)
+ ext/com_dotnet/com_handlers.c
+ ext/com_dotnet/com_misc.c
+ ext/com_dotnet/com_saproxy.c
+ ext/com_dotnet/php_com_dotnet_internal.h:
+ Fixed bug #35316 (Application exception trying to create COM object)
+
+2005-11-27 Marcus Boerger [EMAIL PROTECTED]
+
+* (PHP_5_1)
+ CODING_STANDARDS:
+ - MFH Synch with what we decided for 5 and what we are practicing since 5
+
+2005-11-27 Ilia Alshanetsky [EMAIL PROTECTED]
+
+* (PHP_5_1)
+ NEWS:
+ Disabled native date class, to prevent pear::date conflict.
+
+* (PHP_5_1)
+ NEWS
+ ext/tokenizer/tokenizer.c:
+ tokenizer fixes for bug #35382
+ Bug fixing news
+
+* ZendEngine2/tests/bug35411.phpt
+ ZendEngine2/tests/bug35411.phpt:
+
+ file bug35411.phpt was initially added on branch PHP_5_1.
+
+* (PHP_5_1)
+ ZendEngine2/zend_compile.c
+ ZendEngine2/zend_highlight.c
+ ZendEngine2/zend_language_scanner.l
+ ZendEngine2/tests/bug31341.phpt:
+ Fixed bug #35411 (Regression with \{$ handling).
+ Fixed bug #35382 (Comment in end of file produces fatal error).
+
2005-11-26 Ilia Alshanetsky [EMAIL PROTECTED]
* (PHP_5_1)
@@ -17395,7 +17516,7 @@
* (PHP_4_3)
ext/standard/url_scanner_ex.re:
- Missing $Id: ChangeLog,v 1.2177 2005/11/27 06:47:40 changelog Exp $ tag
+ Missing $Id: ChangeLog,v 1.2178 2005/11/28 06:42:31 changelog Exp $ tag
* (PHP_5_0)
ext/standard/url_scanner_ex.c:
@@ -20796,7 +20917,7 @@
ext/session/mod_mm.h
ext/session/mod_user.h
ext/session/php_session.h:
- - Missing $Id: ChangeLog,v 1.2177 2005/11/27 06:47:40 changelog Exp $
tags
+ - Missing $Id: ChangeLog,v 1.2178 2005/11/28 06:42:31 changelog Exp $
tags
* (PHP_4_3)
ext/session/session.c:
@@ -21277,7 +21398,7 @@
* (PHP_4_3)
Zend/zend_ini_scanner.l:
- Missing $Id: ChangeLog,v 1.2177 2005/11/27 06:47:40 changelog Exp $ tag
+ ws fix
+ Missing $Id: ChangeLog,v 1.2178 2005/11/28 06:42:31 changelog Exp $ tag
+ ws fix
* ZendEngine2/zend_ini_scanner.l
ZendEngine2/zend_ini_scanner.l:
@@ -22751,7 +22872,7 @@
ext/standard/url_scanner_ex.c
ext/standard/url_scanner_ex.h
ext/standard/url_scanner_ex.re:
- Missing $Id: ChangeLog,v 1.2177 2005/11/27 06:47:40 changelog Exp $ tag
+ Missing $Id: ChangeLog,v 1.2178 2005/11/28 06:42:31 changelog Exp $ tag
* ext/standard/credits_ext.h
ext/standard/credits_sapi.h:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Nov 28 01:43:31 2005 EDT
Modified files:
/ZendEngine2ChangeLog
Log:
ChangeLog update
http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.817r2=1.818ty=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.817 ZendEngine2/ChangeLog:1.818
--- ZendEngine2/ChangeLog:1.817 Sun Nov 27 01:48:53 2005
+++ ZendEngine2/ChangeLog Mon Nov 28 01:43:30 2005
@@ -1,3 +1,18 @@
+2005-11-27 Ilia Alshanetsky [EMAIL PROTECTED]
+
+* tests/bug35411.phpt
+ tests/bug35411.phpt:
+
+ file bug35411.phpt was initially added on branch PHP_5_1.
+
+* (PHP_5_1)
+ zend_compile.c
+ zend_highlight.c
+ zend_language_scanner.l
+ tests/bug31341.phpt:
+ Fixed bug #35411 (Regression with \{$ handling).
+ Fixed bug #35382 (Comment in end of file produces fatal error).
+
2005-11-26 Ilia Alshanetsky [EMAIL PROTECTED]
* (PHP_5_1)
@@ -11243,7 +11258,7 @@
2003-06-10 Jani Taskinen [EMAIL PROTECTED]
* zend_multiply.h:
- - Missing $Id: ChangeLog,v 1.817 2005/11/27 06:48:53 changelog Exp $ tag
+ - Missing $Id: ChangeLog,v 1.818 2005/11/28 06:43:30 changelog Exp $ tag
2003-06-10 James Cox [EMAIL PROTECTED]
@@ -12967,7 +12982,7 @@
zend_types.h
zend_variables.c
zend_variables.h:
- - Added some missing CVS $Id: ChangeLog,v 1.817 2005/11/27 06:48:53
changelog Exp $ tags, headers and footers.
+ - Added some missing CVS $Id: ChangeLog,v 1.818 2005/11/28 06:43:30
changelog Exp $ tags, headers and footers.
2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_1) / CODING_STANDARDS
helly Sun Nov 27 06:06:07 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcCODING_STANDARDS Log: - MFH Synch with what we decided for 5 and what we are practicing since 5 http://cvs.php.net/diff.php/php-src/CODING_STANDARDS?r1=1.32r2=1.32.4.1ty=u Index: php-src/CODING_STANDARDS diff -u php-src/CODING_STANDARDS:1.32 php-src/CODING_STANDARDS:1.32.4.1 --- php-src/CODING_STANDARDS:1.32 Fri Jan 30 05:15:24 2004 +++ php-src/CODING_STANDARDSSun Nov 27 06:06:07 2005 @@ -148,20 +148,19 @@ 'buildsomewidget' 'getI()' -[7] Classes should be given descriptive names. Avoid using abbreviations -where possible. Each word in the class name should start with a capital -letter, with words underscore delimited. The class name should be prefixed -with the name of the 'parent set'. +[7] Classes should be given descriptive names. Avoid using abbreviations where +possible. Each word in the class name should start with a capital letter, +without underscore delimiters (CampelCaps starting with a capital letter). +The class name should be prefixed with the name of the 'parent set' (e.g. +the name of the extension). Good: 'Curl' -'Foo_Bar' +'FooBar' Bad: 'foobar' 'foo_bar' -'FooBar' - Syntax and indentation -- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_directory.c
helly Sun Nov 27 07:13:44 2005 EDT
Modified files:
/php-src/ext/splspl_directory.c
Log:
- Fix editor blocks
http://cvs.php.net/diff.php/php-src/ext/spl/spl_directory.c?r1=1.55r2=1.56ty=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.55
php-src/ext/spl/spl_directory.c:1.56
--- php-src/ext/spl/spl_directory.c:1.55Tue Nov 1 11:54:44 2005
+++ php-src/ext/spl/spl_directory.c Sun Nov 27 07:13:42 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.55 2005/11/01 16:54:44 helly Exp $ */
+/* $Id: spl_directory.c,v 1.56 2005/11/27 12:13:42 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1803,8 +1803,9 @@
while(intern-u.file.current_line_num line_pos) {
spl_filesystem_file_read_line(getThis(), intern, 1 TSRMLS_CC);
}
-}
+} /* }}} */
+/* {{{ Function/Class/Method definitions */
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object___construct, 0, 0, 1)
ZEND_ARG_INFO(0, file_name)
@@ -1911,6 +1912,7 @@
SPL_ME(SplTempFileObject, __construct,
arginfo_temp_file_object___construct, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
+/* }}} */
/* {{{ PHP_MINIT_FUNCTION(spl_directory)
*/
--
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/spl spl_directory.c
helly Sun Nov 27 07:16:15 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/splspl_directory.c
Log:
- MFH Editor blocks
http://cvs.php.net/diff.php/php-src/ext/spl/spl_directory.c?r1=1.45.2.2r2=1.45.2.3ty=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.2
php-src/ext/spl/spl_directory.c:1.45.2.3
--- php-src/ext/spl/spl_directory.c:1.45.2.2Thu Sep 15 10:08:14 2005
+++ php-src/ext/spl/spl_directory.c Sun Nov 27 07:16:14 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.2 2005/09/15 14:08:14 helly Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.3 2005/11/27 12:16:14 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1483,7 +1483,9 @@
spl_file_object_read_line(getThis(), intern, 1 TSRMLS_CC);
}
}
+/* }}} */
+/* {{{ Function/Class/Method definitions */
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object___construct, 0, 0, 1)
ZEND_ARG_INFO(0, file_name)
@@ -1580,6 +1582,7 @@
SPL_MA(SplFileObject, __toString, SplFileObject, current,NULL,
ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
+/* }}} */
/* {{{ PHP_MINIT_FUNCTION(spl_directory)
*/
--
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/com_dotnet com_handlers.c com_misc.c com_saproxy.c php_com_dotnet_internal.h
rrichards Sun Nov 27 07:19:05 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/com_dotnet com_misc.c com_saproxy.c com_handlers.c
php_com_dotnet_internal.h
Log:
Fixed bug #35316 (Application exception trying to create COM object)
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_misc.c?r1=1.8r2=1.8.2.1ty=u
Index: php-src/ext/com_dotnet/com_misc.c
diff -u php-src/ext/com_dotnet/com_misc.c:1.8
php-src/ext/com_dotnet/com_misc.c:1.8.2.1
--- php-src/ext/com_dotnet/com_misc.c:1.8 Wed Aug 3 10:06:42 2005
+++ php-src/ext/com_dotnet/com_misc.c Sun Nov 27 07:19:04 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_misc.c,v 1.8 2005/08/03 14:06:42 sniper Exp $ */
+/* $Id: com_misc.c,v 1.8.2.1 2005/11/27 12:19:04 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -51,6 +51,7 @@
memset(obj, 0, sizeof(*obj));
obj-code_page = codepage;
obj-ce = php_com_variant_class_entry;
+ obj-zo.ce = php_com_variant_class_entry;
VariantInit(obj-v);
V_VT(obj-v) = VT_DISPATCH;
@@ -73,6 +74,7 @@
memset(obj, 0, sizeof(*obj));
obj-code_page = codepage;
obj-ce = php_com_variant_class_entry;
+ obj-zo.ce = php_com_variant_class_entry;
VariantInit(obj-v);
VariantCopyInd(obj-v, v);
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_saproxy.c?r1=1.15r2=1.15.2.1ty=u
Index: php-src/ext/com_dotnet/com_saproxy.c
diff -u php-src/ext/com_dotnet/com_saproxy.c:1.15
php-src/ext/com_dotnet/com_saproxy.c:1.15.2.1
--- php-src/ext/com_dotnet/com_saproxy.c:1.15 Wed Aug 3 10:06:42 2005
+++ php-src/ext/com_dotnet/com_saproxy.cSun Nov 27 07:19:04 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_saproxy.c,v 1.15 2005/08/03 14:06:42 sniper Exp $ */
+/* $Id: com_saproxy.c,v 1.15.2.1 2005/11/27 12:19:04 rrichards Exp $ */
/* This module implements a SafeArray proxy which is used internally
* by the engine when resolving multi-dimensional array accesses on
@@ -323,7 +323,7 @@
return NULL;
}
-static union _zend_function *saproxy_method_get(zval *object, char *name, int
len TSRMLS_DC)
+static union _zend_function *saproxy_method_get(zval **object, char *name, int
len TSRMLS_DC)
{
/* no methods */
return NULL;
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.30r2=1.30.2.1ty=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.30
php-src/ext/com_dotnet/com_handlers.c:1.30.2.1
--- php-src/ext/com_dotnet/com_handlers.c:1.30 Wed Aug 3 10:06:41 2005
+++ php-src/ext/com_dotnet/com_handlers.c Sun Nov 27 07:19:04 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_handlers.c,v 1.30 2005/08/03 14:06:41 sniper Exp $ */
+/* $Id: com_handlers.c,v 1.30.2.1 2005/11/27 12:19:04 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -677,6 +677,7 @@
VariantInit(obj-v);
obj-code_page = CP_ACP;
obj-ce = ce;
+ obj-zo.ce = ce;
retval.handle = zend_objects_store_put(obj, NULL,
php_com_object_free_storage, php_com_object_clone TSRMLS_CC);
retval.handlers = php_com_object_handlers;
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/php_com_dotnet_internal.h?r1=1.14r2=1.14.2.1ty=u
Index: php-src/ext/com_dotnet/php_com_dotnet_internal.h
diff -u php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.14
php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.14.2.1
--- php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.14 Wed Aug 3
10:06:43 2005
+++ php-src/ext/com_dotnet/php_com_dotnet_internal.hSun Nov 27 07:19:04 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_com_dotnet_internal.h,v 1.14 2005/08/03 14:06:43 sniper Exp $ */
+/* $Id: php_com_dotnet_internal.h,v 1.14.2.1 2005/11/27 12:19:04 rrichards Exp
$ */
#ifndef PHP_COM_DOTNET_INTERNAL_H
#define PHP_COM_DOTNET_INTERNAL_H
@@ -33,6 +33,8 @@
#undef php_win_err
typedef struct _php_com_dotnet_object {
+ zend_object zo;
+
VARIANT v;
ITypeInfo *typeinfo;
--
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_handlers.c com_misc.c com_saproxy.c com_variant.c php_com_dotnet_internal.h
rrichards Sun Nov 27 07:21:13 2005 EDT
Modified files:
/php-src/ext/com_dotnet com_handlers.c com_misc.c com_saproxy.c
com_variant.c php_com_dotnet_internal.h
Log:
Fixed bug #35316 (Application exception trying to create COM object)
Fix some handler signatures causing memory corruption
Various unicode fixes
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.31r2=1.32ty=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.31
php-src/ext/com_dotnet/com_handlers.c:1.32
--- php-src/ext/com_dotnet/com_handlers.c:1.31 Sat Aug 13 15:03:58 2005
+++ php-src/ext/com_dotnet/com_handlers.c Sun Nov 27 07:21:12 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_handlers.c,v 1.31 2005/08/13 19:03:58 wez Exp $ */
+/* $Id: com_handlers.c,v 1.32 2005/11/27 12:21:12 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -486,17 +486,13 @@
return ret;
}
-static int com_object_cast(zval *readobj, zval *writeobj, int type, int
should_free TSRMLS_DC)
+static int com_object_cast(zval *readobj, zval *writeobj, int type TSRMLS_DC)
{
php_com_dotnet_object *obj;
VARIANT v;
VARTYPE vt = VT_EMPTY;
zval free_obj;
HRESULT res = S_OK;
-
- if (should_free) {
- free_obj = *writeobj;
- }
obj = CDNO_FETCH(readobj);
ZVAL_NULL(writeobj);
@@ -539,10 +535,6 @@
VariantClear(v);
- if (should_free) {
- zval_dtor(free_obj);
- }
-
if (SUCCEEDED(res)) {
return SUCCESS;
}
@@ -678,6 +670,7 @@
VariantInit(obj-v);
obj-code_page = CP_ACP;
obj-ce = ce;
+ obj-zo.ce = ce;
retval.handle = zend_objects_store_put(obj, NULL,
php_com_object_free_storage, php_com_object_clone TSRMLS_CC);
retval.handlers = php_com_object_handlers;
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_misc.c?r1=1.8r2=1.9ty=u
Index: php-src/ext/com_dotnet/com_misc.c
diff -u php-src/ext/com_dotnet/com_misc.c:1.8
php-src/ext/com_dotnet/com_misc.c:1.9
--- php-src/ext/com_dotnet/com_misc.c:1.8 Wed Aug 3 10:06:42 2005
+++ php-src/ext/com_dotnet/com_misc.c Sun Nov 27 07:21:12 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_misc.c,v 1.8 2005/08/03 14:06:42 sniper Exp $ */
+/* $Id: com_misc.c,v 1.9 2005/11/27 12:21:12 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -36,7 +36,7 @@
message = php_win_err(code);
free_msg = 1;
}
- zend_throw_exception(php_com_exception_class_entry, message, (long)code
TSRMLS_CC);
+ zend_throw_exception(U_CLASS_ENTRY(php_com_exception_class_entry),
message, (long)code TSRMLS_CC);
if (free_msg) {
LocalFree(message);
}
@@ -51,6 +51,7 @@
memset(obj, 0, sizeof(*obj));
obj-code_page = codepage;
obj-ce = php_com_variant_class_entry;
+ obj-zo.ce = php_com_variant_class_entry;
VariantInit(obj-v);
V_VT(obj-v) = VT_DISPATCH;
@@ -73,6 +74,7 @@
memset(obj, 0, sizeof(*obj));
obj-code_page = codepage;
obj-ce = php_com_variant_class_entry;
+ obj-zo.ce = php_com_variant_class_entry;
VariantInit(obj-v);
VariantCopyInd(obj-v, v);
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_saproxy.c?r1=1.15r2=1.16ty=u
Index: php-src/ext/com_dotnet/com_saproxy.c
diff -u php-src/ext/com_dotnet/com_saproxy.c:1.15
php-src/ext/com_dotnet/com_saproxy.c:1.16
--- php-src/ext/com_dotnet/com_saproxy.c:1.15 Wed Aug 3 10:06:42 2005
+++ php-src/ext/com_dotnet/com_saproxy.cSun Nov 27 07:21:12 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_saproxy.c,v 1.15 2005/08/03 14:06:42 sniper Exp $ */
+/* $Id: com_saproxy.c,v 1.16 2005/11/27 12:21:12 rrichards Exp $ */
/* This module implements a SafeArray proxy which is used internally
* by the engine when resolving multi-dimensional array accesses on
@@ -323,7 +323,7 @@
return NULL;
}
-static union _zend_function *saproxy_method_get(zval *object, char *name, int
len TSRMLS_DC)
+static union _zend_function *saproxy_method_get(zval **object, char *name, int
len TSRMLS_DC)
{
/* no methods */
return NULL;
@@ -357,7 +357,7 @@
return -1;
}
-static int saproxy_object_cast(zval *readobj, zval *writeobj, int type, int
should_free TSRMLS_DC)
+static int saproxy_object_cast(zval *readobj, zval *writeobj, int type
TSRMLS_DC)
{
return FAILURE;
}
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_variant.c?r1=1.13r2=1.14ty=u
Index: php-src/ext/com_dotnet/com_variant.c
diff -u
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
rrichards Sun Nov 27 07:22:05 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.229r2=1.2027.2.230ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.229 php-src/NEWS:1.2027.2.230 --- php-src/NEWS:1.2027.2.229 Sun Nov 27 01:51:39 2005 +++ php-src/NEWSSun Nov 27 07:22:04 2005 @@ -17,6 +17,7 @@ - Fixed bug #35360 (exceptions in interactive mode (php -a) may cause crash). (Dmitry) - Fixed bug #35358 (Incorrect error messages for PDO class constants). (Ilia) +- Fixed bug #35316 (Application exception trying to create COM object). (Rob) - Fixed bug #35170 (PHP_AUTH_DIGEST differs under Apache 1.x and 2.x). (Ilia) 24 Nov 2005, PHP 5.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_1) /ext/spl/examples nocvsdir.php
helly Sun Nov 27 07:22:54 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl/examples nocvsdir.php
Log:
- Fixed bug #35423 RecursiveDirectoryIterator doesnt appear to recurse with
RecursiveFilterIterator
http://cvs.php.net/diff.php/php-src/ext/spl/examples/nocvsdir.php?r1=1.2r2=1.2.2.1ty=u
Index: php-src/ext/spl/examples/nocvsdir.php
diff -u php-src/ext/spl/examples/nocvsdir.php:1.2
php-src/ext/spl/examples/nocvsdir.php:1.2.2.1
--- php-src/ext/spl/examples/nocvsdir.php:1.2 Tue Feb 8 14:10:05 2005
+++ php-src/ext/spl/examples/nocvsdir.php Sun Nov 27 07:22:54 2005
@@ -28,13 +28,23 @@
class NoCvsDirectory extends RecursiveFilterIterator
{
+ function __construct($path)
+ {
+ parent::__construct(new RecursiveDirectoryIterator($path));
+ }
+
function accept()
{
return $this-getInnerIterator()-getFilename() != 'CVS';
}
+
+ function getChildren()
+ {
+ return new NoCvsDirectory($this-current()-getPathName());
+ }
}
-$it = new RecursiveIteratorIterator(new NoCvsDirectory(new
RecursiveDirectoryIterator($argv[1])));
+$it = new RecursiveIteratorIterator(new NoCvsDirectory($argv[1]));
foreach($it as $pathname = $file)
{
--
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
helly Sun Nov 27 07:24:57 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
Log:
- BFN
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.230r2=1.2027.2.231ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.230 php-src/NEWS:1.2027.2.231
--- php-src/NEWS:1.2027.2.230 Sun Nov 27 07:22:04 2005
+++ php-src/NEWSSun Nov 27 07:24:55 2005
@@ -6,6 +6,8 @@
- Added an additional field $frame['object'] to the result array of
debug_backtrace() that contains a reference to the respective object when the
frame was called from an object. (Sebastian)
+- Fixed bug #35423 (RecursiveDirectoryIterator doesnt appear to recurse with
+ RecursiveFilterIterator). (Marcus)
- Fixed bug #35413 (Removed -dev flag from Zend Engine version). (Ilia)
- Fixed bug #35411 (Regression with \{$ handling). (Ilia)
- Fixed bug #35406 (eval hangs when evall'ed code ends with comment w/o
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_directory.c spl_directory.h
helly Sun Nov 27 08:07:19 2005 EDT
Modified files:
/php-src/ext/splspl_directory.c spl_directory.h
Log:
- Fix minor issues in RecursiveDirectoryIterator provide new flag consts
http://cvs.php.net/diff.php/php-src/ext/spl/spl_directory.c?r1=1.56r2=1.57ty=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.56
php-src/ext/spl/spl_directory.c:1.57
--- php-src/ext/spl/spl_directory.c:1.56Sun Nov 27 07:13:42 2005
+++ php-src/ext/spl/spl_directory.c Sun Nov 27 08:07:18 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.56 2005/11/27 12:13:42 helly Exp $ */
+/* $Id: spl_directory.c,v 1.57 2005/11/27 13:07:18 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -334,7 +334,7 @@
switch (type) {
case SPL_FS_INFO:
- return_value-value.obj = spl_filesystem_object_new_ex(ce ? ce
: intern-info_class, intern TSRMLS_CC);
+ return_value-value.obj = spl_filesystem_object_new_ex(ce ? ce
: source-info_class, intern TSRMLS_CC);
Z_TYPE_P(return_value) = IS_OBJECT;
spl_filesystem_object_get_file_name(source TSRMLS_CC);
@@ -342,7 +342,7 @@
intern-file_name_len = source-file_name_len;
break;
case SPL_FS_FILE:
- return_value-value.obj = spl_filesystem_object_new_ex(ce ? ce
: intern-file_class, intern TSRMLS_CC);
+ return_value-value.obj = spl_filesystem_object_new_ex(ce ? ce
: source-file_class, intern TSRMLS_CC);
Z_TYPE_P(return_value) = IS_OBJECT;
spl_filesystem_object_get_file_name(source TSRMLS_CC);
@@ -549,11 +549,15 @@
{
spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
- if (intern-flags SPL_FILE_DIR_CURRENT_AS_FILEINFO) {
+ if (intern-flags SPL_FILE_DIR_CURRENT_AS_PATHNAME) {
+ spl_filesystem_object_get_file_name(intern TSRMLS_CC);
+ RETURN_STRINGL(intern-file_name, intern-file_name_len, 1);
+ } else if (intern-flags SPL_FILE_DIR_CURRENT_AS_FILEINFO) {
spl_filesystem_object_get_file_name(intern TSRMLS_CC);
spl_filesystem_object_create_type(0, intern, SPL_FS_INFO, NULL,
return_value TSRMLS_CC);
} else {
- RETURN_STRING(intern-u.dir.entry.d_name, 1);
+ RETURN_ZVAL(getThis(), 1, 0);
+ /*RETURN_STRING(intern-u.dir.entry.d_name, 1);*/
}
}
/* }}} */
@@ -1031,7 +1035,14 @@
spl_filesystem_dir_it *iterator = (spl_filesystem_dir_it *)iter;
spl_filesystem_object *object = iterator-object;
- if (object-flags SPL_FILE_DIR_CURRENT_AS_FILEINFO) {
+ if (object-flags SPL_FILE_DIR_CURRENT_AS_PATHNAME) {
+ if (!iterator-current) {
+ ALLOC_INIT_ZVAL(iterator-current);
+ spl_filesystem_object_get_file_name(object TSRMLS_CC);
+ ZVAL_STRINGL(iterator-current, object-file_name,
object-file_name_len, 1);
+ }
+ *data = iterator-current;
+ } else if (object-flags SPL_FILE_DIR_CURRENT_AS_FILEINFO) {
if (!iterator-current) {
ALLOC_INIT_ZVAL(iterator-current);
spl_filesystem_object_get_file_name(object TSRMLS_CC);
@@ -1930,7 +1941,13 @@
REGISTER_SPL_SUB_CLASS_EX(RecursiveDirectoryIterator,
DirectoryIterator, spl_filesystem_object_new,
spl_RecursiveDirectoryIterator_functions);
REGISTER_SPL_IMPLEMENTS(RecursiveDirectoryIterator, RecursiveIterator);
+
+ REGISTER_SPL_CLASS_CONST_LONG(RecursiveDirectoryIterator,
CURRENT_MODE_MASK, SPL_FILE_DIR_CURRENT_MODE_MASK);
+ REGISTER_SPL_CLASS_CONST_LONG(RecursiveDirectoryIterator,
CURRENT_AS_PATHNAME, SPL_FILE_DIR_CURRENT_AS_PATHNAME);
REGISTER_SPL_CLASS_CONST_LONG(RecursiveDirectoryIterator,
CURRENT_AS_FILEINFO, SPL_FILE_DIR_CURRENT_AS_FILEINFO);
+ REGISTER_SPL_CLASS_CONST_LONG(RecursiveDirectoryIterator,
CURRENT_AS_SELF, 0);
+ REGISTER_SPL_CLASS_CONST_LONG(RecursiveDirectoryIterator,
KEY_MODE_MASK, SPL_FILE_DIR_KEY_MODE_MASK);
+ REGISTER_SPL_CLASS_CONST_LONG(RecursiveDirectoryIterator,
KEY_AS_PATHNAME, 0);
REGISTER_SPL_CLASS_CONST_LONG(RecursiveDirectoryIterator,
KEY_AS_FILENAME, SPL_FILE_DIR_KEY_AS_FILENAME);
REGISTER_SPL_CLASS_CONST_LONG(RecursiveDirectoryIterator,
NEW_CURRENT_AND_KEY,
SPL_FILE_DIR_KEY_AS_FILENAME|SPL_FILE_DIR_CURRENT_AS_FILEINFO);
http://cvs.php.net/diff.php/php-src/ext/spl/spl_directory.h?r1=1.17r2=1.18ty=u
Index: php-src/ext/spl/spl_directory.h
diff -u php-src/ext/spl/spl_directory.h:1.17
php-src/ext/spl/spl_directory.h:1.18
--- php-src/ext/spl/spl_directory.h:1.17Tue Nov 1 11:54:44
Re: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/mysqli/tests 009.phpt
On Sat, 26 Nov 2005, Ilia Alshanetsky wrote: Andrey Hristov wrote: andrey Thu Nov 24 20:13:58 2005 EDT why this change, it breaks the test? Data in mysql shows - which is what is being returned, how can a return value 0 be correct? I guess it's some bug in mysql 4.1.x. IIRC, Andrey said on IRC that he got 0 with 5.x. --Jani -- 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) /ext/mysqli/tests 009.phpt
Hello Jani, so whyt not make the check (%s) if mysql changes that result? regards marcus Sunday, November 27, 2005, 2:18:45 PM, you wrote: On Sat, 26 Nov 2005, Ilia Alshanetsky wrote: Andrey Hristov wrote: andrey Thu Nov 24 20:13:58 2005 EDT why this change, it breaks the test? Data in mysql shows - which is what is being returned, how can a return value 0 be correct? I guess it's some bug in mysql 4.1.x. IIRC, Andrey said on IRC that he got 0 with 5.x. --Jani 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_1) / NEWS
sniper Sun Nov 27 08:24:55 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: fix news http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.231r2=1.2027.2.232ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.231 php-src/NEWS:1.2027.2.232 --- php-src/NEWS:1.2027.2.231 Sun Nov 27 07:24:55 2005 +++ php-src/NEWSSun Nov 27 08:24:53 2005 @@ -1,8 +1,8 @@ PHPNEWS ||| ?? ??? 2006, PHP 5.1.1 -- Disabled native date class, to prevent pear::date conflict. (Ilia) -- Make reflection constants be both PHP and class constants. (Johannes) +- Disabled native date class to prevent pear::date conflict. (Ilia) +- Changed reflection constants be both PHP and class constants. (Johannes) - Added an additional field $frame['object'] to the result array of debug_backtrace() that contains a reference to the respective object when the frame was called from an object. (Sebastian) -- 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 configure.in /main php_version.h
iliaa Sun Nov 27 09:19:40 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS configure.in /php-src/main php_version.h Log: 5.1.1 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.232r2=1.2027.2.233ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.232 php-src/NEWS:1.2027.2.233 --- php-src/NEWS:1.2027.2.232 Sun Nov 27 08:24:53 2005 +++ php-src/NEWSSun Nov 27 09:19:38 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2006, PHP 5.1.1 +29 Nov 2006, PHP 5.1.1 - Disabled native date class to prevent pear::date conflict. (Ilia) - Changed reflection constants be both PHP and class constants. (Johannes) - Added an additional field $frame['object'] to the result array of @@ -19,6 +19,7 @@ - Fixed bug #35360 (exceptions in interactive mode (php -a) may cause crash). (Dmitry) - Fixed bug #35358 (Incorrect error messages for PDO class constants). (Ilia) +- Fixed bug #35338 (pdo_pgsql does not handle binary bound params). (Wez) - Fixed bug #35316 (Application exception trying to create COM object). (Rob) - Fixed bug #35170 (PHP_AUTH_DIGEST differs under Apache 1.x and 2.x). (Ilia) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.22r2=1.579.2.23ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.22 php-src/configure.in:1.579.2.23 --- php-src/configure.in:1.579.2.22 Wed Nov 23 16:25:37 2005 +++ php-src/configure.inSun Nov 27 09:19:38 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.22 2005/11/23 21:25:37 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.23 2005/11/27 14:19:38 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=1 -EXTRA_VERSION=-dev +EXTRA_VERSION= 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.112.2.17r2=1.112.2.18ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.17 php-src/main/php_version.h:1.112.2.18 --- php-src/main/php_version.h:1.112.2.17 Wed Nov 23 16:25:36 2005 +++ php-src/main/php_version.h Sun Nov 27 09:19:40 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 1 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.1.1-dev +#define PHP_EXTRA_VERSION +#define PHP_VERSION 5.1.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_1) / NEWS
iliaa Sun Nov 27 10:38:09 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
Log:
Adjust news
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.233r2=1.2027.2.234ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.233 php-src/NEWS:1.2027.2.234
--- php-src/NEWS:1.2027.2.233 Sun Nov 27 09:19:38 2005
+++ php-src/NEWSSun Nov 27 10:38:07 2005
@@ -1,6 +1,6 @@
PHPNEWS
|||
-29 Nov 2006, PHP 5.1.1
+28 Nov 2006, PHP 5.1.1
- Disabled native date class to prevent pear::date conflict. (Ilia)
- Changed reflection constants be both PHP and class constants. (Johannes)
- Added an additional field $frame['object'] to the result array of
@@ -12,7 +12,6 @@
- Fixed bug #35411 (Regression with \{$ handling). (Ilia)
- Fixed bug #35406 (eval hangs when evall'ed code ends with comment w/o
newline). (Marcus)
-- Fixed bug #35402 (New date class causes crash in get_object_vars()). (Tony)
- Fixed bug #35391 (pdo_mysql::exec does not return number of affected rows).
(Tony)
- Fixed bug #35382 (Comment in end of file produces fatal error). (Ilia)
--
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) / UPGRADING
iliaa Sun Nov 27 10:39:09 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcUPGRADING Log: removed no longer relevant portion. http://cvs.php.net/diff.php/php-src/UPGRADING?r1=1.1.2.2r2=1.1.2.3ty=u Index: php-src/UPGRADING diff -u php-src/UPGRADING:1.1.2.2 php-src/UPGRADING:1.1.2.3 --- php-src/UPGRADING:1.1.2.2 Wed Nov 23 10:01:54 2005 +++ php-src/UPGRADING Sun Nov 27 10:39:09 2005 @@ -1,4 +1,4 @@ -$Id: UPGRADING,v 1.1.2.2 2005/11/23 15:01:54 sniper Exp $ +$Id: UPGRADING,v 1.1.2.3 2005/11/27 15:39:09 iliaa Exp $ UPGRADE NOTES - PHP 5.1 @@ -404,10 +404,6 @@ in order to minimise pollution of the global namespace in PHP. -Note that the new Date class exists at this point purely to allow the core date -extension to adhere to the above convention, although extended functionality -is planned for the the class in the future. - 10. Date/time support -- 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
sniper Sun Nov 27 11:33:19 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: Back from future http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.234r2=1.2027.2.235ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.234 php-src/NEWS:1.2027.2.235 --- php-src/NEWS:1.2027.2.234 Sun Nov 27 10:38:07 2005 +++ php-src/NEWSSun Nov 27 11:33:18 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -28 Nov 2006, PHP 5.1.1 +28 Nov 2005, PHP 5.1.1 - Disabled native date class to prevent pear::date conflict. (Ilia) - Changed reflection constants be both PHP and class constants. (Johannes) - Added an additional field $frame['object'] to the result array of -- 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) / configure.in /main php_version.h
iliaa Sun Nov 27 12:29:55 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcconfigure.in /php-src/main php_version.h Log: Back to dev http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.23r2=1.579.2.24ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.23 php-src/configure.in:1.579.2.24 --- php-src/configure.in:1.579.2.23 Sun Nov 27 09:19:38 2005 +++ php-src/configure.inSun Nov 27 12:29:52 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.23 2005/11/27 14:19:38 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.24 2005/11/27 17:29:52 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,8 +41,8 @@ MAJOR_VERSION=5 MINOR_VERSION=1 -RELEASE_VERSION=1 -EXTRA_VERSION= +RELEASE_VERSION=2 +EXTRA_VERSION=-dev 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.112.2.18r2=1.112.2.19ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.18 php-src/main/php_version.h:1.112.2.19 --- php-src/main/php_version.h:1.112.2.18 Sun Nov 27 09:19:40 2005 +++ php-src/main/php_version.h Sun Nov 27 12:29:54 2005 @@ -2,6 +2,6 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 -#define PHP_RELEASE_VERSION 1 -#define PHP_EXTRA_VERSION -#define PHP_VERSION 5.1.1 +#define PHP_RELEASE_VERSION 2 +#define PHP_EXTRA_VERSION -dev +#define PHP_VERSION 5.1.2-dev -- 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) / configure.in /main php_version.h
Watch out.. The DOM extension build is broken.. Nuno - Original Message - iliaa Sun Nov 27 12:29:55 2005 EDT Modified files: (Branch: PHP_5_1) /php-src configure.in /php-src/main php_version.h Log: Back to dev http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.23r2=1.579.2.24ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.23 php-src/configure.in:1.579.2.24 --- php-src/configure.in:1.579.2.23 Sun Nov 27 09:19:38 2005 +++ php-src/configure.in Sun Nov 27 12:29:52 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.23 2005/11/27 14:19:38 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.24 2005/11/27 17:29:52 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,8 +41,8 @@ MAJOR_VERSION=5 MINOR_VERSION=1 -RELEASE_VERSION=1 -EXTRA_VERSION= +RELEASE_VERSION=2 +EXTRA_VERSION=-dev 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.112.2.18r2=1.112.2.19ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.18 php-src/main/php_version.h:1.112.2.19 --- php-src/main/php_version.h:1.112.2.18 Sun Nov 27 09:19:40 2005 +++ php-src/main/php_version.h Sun Nov 27 12:29:54 2005 @@ -2,6 +2,6 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 -#define PHP_RELEASE_VERSION 1 -#define PHP_EXTRA_VERSION -#define PHP_VERSION 5.1.1 +#define PHP_RELEASE_VERSION 2 +#define PHP_EXTRA_VERSION -dev +#define PHP_VERSION 5.1.2-dev -- 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) / configure.in /main php_version.h
Which build are you referring to? I just build 5.1.1-cvs with and without ZTS mode and dom extension compiled fine. I also checked the win32 snapshot box and there appear to be no issues with building the dom extension. All dom tests pass as well, more over the last DOM change was before 5.1.0 was even released. 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) / configure.in /main php_version.h
Which build are you referring to? I just build 5.1.1-cvs with and without ZTS mode and dom extension compiled fine. I also checked the win32 snapshot box and there appear to be no issues with building the dom extension. All dom tests pass as well, more over the last DOM change was before 5.1.0 was even released. Ilia Sorry Ilia, but it was just the usual cvs problems. It hadn't updated the Zend directory. I'm now finishing building latest php5-cvs and it already compiled DOM. Sorry for the noise, Nuno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_oci oci_driver.c
tony2001Sun Nov 27 13:34:16 2005 EDT
Modified files:
/php-src/ext/pdo_ocioci_driver.c
Log:
plug memory leak
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/oci_driver.c?r1=1.27r2=1.28ty=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.27
php-src/ext/pdo_oci/oci_driver.c:1.28
--- php-src/ext/pdo_oci/oci_driver.c:1.27 Sun Sep 11 01:08:49 2005
+++ php-src/ext/pdo_oci/oci_driver.cSun Nov 27 13:34:16 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: oci_driver.c,v 1.27 2005/09/11 05:08:49 wez Exp $ */
+/* $Id: oci_driver.c,v 1.28 2005/11/27 18:34:16 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -149,10 +149,10 @@
* so that we can catch the error information when execute
* is called via query. See Bug #33707 */
if (H-einfo.errmsg) {
- efree(H-einfo.errmsg);
+ pefree(H-einfo.errmsg, dbh-is_persistent);
}
H-einfo = *einfo;
- H-einfo.errmsg = einfo-errmsg ? estrdup(einfo-errmsg) : NULL;
+ H-einfo.errmsg = einfo-errmsg ? pestrdup(einfo-errmsg,
dbh-is_persistent) : NULL;
strcpy(dbh-error_code, stmt-error_code);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_oci config.m4
tony2001Sun Nov 27 13:35:35 2005 EDT Modified files: /php-src/ext/pdo_ociconfig.m4 Log: fix config.m4 http://cvs.php.net/diff.php/php-src/ext/pdo_oci/config.m4?r1=1.15r2=1.16ty=u Index: php-src/ext/pdo_oci/config.m4 diff -u php-src/ext/pdo_oci/config.m4:1.15 php-src/ext/pdo_oci/config.m4:1.16 --- php-src/ext/pdo_oci/config.m4:1.15 Sat Sep 24 19:22:43 2005 +++ php-src/ext/pdo_oci/config.m4 Sun Nov 27 13:35:35 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.15 2005/09/24 23:22:43 sniper Exp $ +dnl $Id: config.m4,v 1.16 2005/11/27 18:35:35 tony2001 Exp $ if test $PHP_PDO != no; then @@ -35,7 +35,7 @@ if test $PHP_PDO_OCI != no; then AC_MSG_CHECKING([Oracle Install-Dir]) - if test $PHP_PDO_OCI = yes -o -z $PHP_PDO_OCI; then + if test $PHP_PDO_OCI = yes || test -z $PHP_PDO_OCI; then PDO_OCI_DIR=$ORACLE_HOME else PDO_OCI_DIR=$PHP_PDO_OCI -- 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_oci config.m4 oci_driver.c
tony2001Sun Nov 27 13:36:11 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_ociconfig.m4 oci_driver.c
Log:
MFH: plug memory leak
fix config.m4
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/config.m4?r1=1.14.2.1r2=1.14.2.2ty=u
Index: php-src/ext/pdo_oci/config.m4
diff -u php-src/ext/pdo_oci/config.m4:1.14.2.1
php-src/ext/pdo_oci/config.m4:1.14.2.2
--- php-src/ext/pdo_oci/config.m4:1.14.2.1 Sat Sep 24 19:23:24 2005
+++ php-src/ext/pdo_oci/config.m4 Sun Nov 27 13:36:11 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.14.2.1 2005/09/24 23:23:24 sniper Exp $
+dnl $Id: config.m4,v 1.14.2.2 2005/11/27 18:36:11 tony2001 Exp $
if test $PHP_PDO != no; then
@@ -35,7 +35,7 @@
if test $PHP_PDO_OCI != no; then
AC_MSG_CHECKING([Oracle Install-Dir])
- if test $PHP_PDO_OCI = yes -o -z $PHP_PDO_OCI; then
+ if test $PHP_PDO_OCI = yes || test -z $PHP_PDO_OCI; then
PDO_OCI_DIR=$ORACLE_HOME
else
PDO_OCI_DIR=$PHP_PDO_OCI
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/oci_driver.c?r1=1.24.2.2r2=1.24.2.3ty=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.24.2.2
php-src/ext/pdo_oci/oci_driver.c:1.24.2.3
--- php-src/ext/pdo_oci/oci_driver.c:1.24.2.2 Sat Sep 10 21:42:38 2005
+++ php-src/ext/pdo_oci/oci_driver.cSun Nov 27 13:36:11 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: oci_driver.c,v 1.24.2.2 2005/09/11 01:42:38 wez Exp $ */
+/* $Id: oci_driver.c,v 1.24.2.3 2005/11/27 18:36:11 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -149,10 +149,10 @@
* so that we can catch the error information when execute
* is called via query. See Bug #33707 */
if (H-einfo.errmsg) {
- efree(H-einfo.errmsg);
+ pefree(H-einfo.errmsg, dbh-is_persistent);
}
H-einfo = *einfo;
- H-einfo.errmsg = einfo-errmsg ? estrdup(einfo-errmsg) : NULL;
+ H-einfo.errmsg = einfo-errmsg ? pestrdup(einfo-errmsg,
dbh-is_persistent) : NULL;
strcpy(dbh-error_code, stmt-error_code);
}
--
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/curl interface.c
iliaa Sun Nov 27 15:07:40 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/curl interface.c
Log:
Improved safe_mode/open_basedir check.
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.62.2.6r2=1.62.2.7ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.6
php-src/ext/curl/interface.c:1.62.2.7
--- php-src/ext/curl/interface.c:1.62.2.6 Mon Oct 31 18:44:40 2005
+++ php-src/ext/curl/interface.cSun Nov 27 15:07:36 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.6 2005/10/31 23:44:40 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.7 2005/11/27 20:07:36 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -110,7 +110,7 @@
#define PHP_CURL_CHECK_OPEN_BASEDIR(str, len)
\
if (((PG(open_basedir) *PG(open_basedir)) || PG(safe_mode))
\
- strncasecmp(str, file://, sizeof(file://) - 1) == 0)
\
+ strncasecmp(str, file:, sizeof(file:) - 1) == 0)
\
{
\
php_url *tmp_url;
\
\
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
sniper Sun Nov 27 15:10:15 2005 EDT
Modified files:
/php-src/ext/curl interface.c
Log:
MF51: improve open_basedir check
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.69r2=1.70ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.69 php-src/ext/curl/interface.c:1.70
--- php-src/ext/curl/interface.c:1.69 Mon Oct 31 18:45:50 2005
+++ php-src/ext/curl/interface.cSun Nov 27 15:10:15 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.69 2005/10/31 23:45:50 iliaa Exp $ */
+/* $Id: interface.c,v 1.70 2005/11/27 20:10:15 sniper Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -110,7 +110,7 @@
#define PHP_CURL_CHECK_OPEN_BASEDIR(str, len)
\
if (((PG(open_basedir) *PG(open_basedir)) || PG(safe_mode))
\
- strncasecmp(str, file://, sizeof(file://) - 1) == 0)
\
+ strncasecmp(str, file:, sizeof(file:) - 1) == 0)
\
{
\
php_url *tmp_url;
\
\
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_stmt.c
tony2001Sun Nov 27 15:56:47 2005 EDT
Modified files:
/php-src/ext/pdopdo_stmt.c
Log:
fix #35430 (PDO crashes on incorrect FETCH_FUNC use)
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.131r2=1.132ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.131 php-src/ext/pdo/pdo_stmt.c:1.132
--- php-src/ext/pdo/pdo_stmt.c:1.131Thu Nov 24 11:22:27 2005
+++ php-src/ext/pdo/pdo_stmt.c Sun Nov 27 15:56:46 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.131 2005/11/24 16:22:27 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.132 2005/11/27 20:56:46 tony2001 Exp $ */
/* The PDO Statement Handle Class */
@@ -1305,13 +1305,15 @@
switch(ZEND_NUM_ARGS()) {
case 0:
case 1:
+ pdo_raise_impl_error(stmt-dbh, stmt, HY000, no
fetch function specified TSRMLS_CC);
+ error = 1;
break;
case 3:
case 2:
stmt-fetch.func.function = arg2;
+ do_fetch_func_prepare(stmt TSRMLS_CC);
break;
}
- do_fetch_func_prepare(stmt TSRMLS_CC);
break;
case PDO_FETCH_COLUMN:
--
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 /ext/pdo pdo_stmt.c
tony2001Sun Nov 27 16:01:02 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/pdopdo_stmt.c
Log:
MFH: fix #35430 (PDO crashes on incorrect FETCH_FUNC use)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.235r2=1.2027.2.236ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.235 php-src/NEWS:1.2027.2.236
--- php-src/NEWS:1.2027.2.235 Sun Nov 27 11:33:18 2005
+++ php-src/NEWSSun Nov 27 16:01:00 2005
@@ -1,5 +1,8 @@
PHPNEWS
|||
+?? ??? 200?, PHP 5.1.2
+- Fixed bug #35430 (PDO crashes on incorrect FETCH_FUNC use). (Tony)
+
28 Nov 2005, PHP 5.1.1
- Disabled native date class to prevent pear::date conflict. (Ilia)
- Changed reflection constants be both PHP and class constants. (Johannes)
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.21r2=1.118.2.22ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.21
php-src/ext/pdo/pdo_stmt.c:1.118.2.22
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.21 Sat Nov 26 16:20:52 2005
+++ php-src/ext/pdo/pdo_stmt.c Sun Nov 27 16:01:02 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.21 2005/11/26 21:20:52 wez Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.22 2005/11/27 21:01:02 tony2001 Exp $ */
/* The PDO Statement Handle Class */
@@ -1353,13 +1353,15 @@
switch(ZEND_NUM_ARGS()) {
case 0:
case 1:
+ pdo_raise_impl_error(stmt-dbh, stmt, HY000, no
fetch function specified TSRMLS_CC);
+ error = 1;
break;
case 3:
case 2:
stmt-fetch.func.function = arg2;
+ do_fetch_func_prepare(stmt TSRMLS_CC);
break;
}
- do_fetch_func_prepare(stmt TSRMLS_CC);
break;
case PDO_FETCH_COLUMN:
--
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 pdo_stmt.c
wez Sun Nov 27 16:01:59 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdopdo_stmt.c
Log:
Fix #35431; LAZY fetch and fetchAll == crash.
Lazy makes no sense with fetchAll; disallow it.
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.22r2=1.118.2.23ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.22
php-src/ext/pdo/pdo_stmt.c:1.118.2.23
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.22 Sun Nov 27 16:01:02 2005
+++ php-src/ext/pdo/pdo_stmt.c Sun Nov 27 16:01:58 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.22 2005/11/27 21:01:02 tony2001 Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.23 2005/11/27 21:01:58 wez Exp $ */
/* The PDO Statement Handle Class */
@@ -1138,6 +1138,13 @@
return 0;
}
return 1;
+
+ case PDO_FETCH_LAZY:
+ if (fetch_all) {
+ pdo_raise_impl_error(stmt-dbh, stmt, HY000,
PDO::FETCH_LAZY can't be used with PDOStatement::fetchAll() TSRMLS_CC);
+ return 0;
+ }
+ /* fall through */
default:
if ((flags PDO_FETCH_SERIALIZE) == PDO_FETCH_SERIALIZE) {
--
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
wez Sun Nov 27 16:17:20 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.236r2=1.2027.2.237ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.236 php-src/NEWS:1.2027.2.237 --- php-src/NEWS:1.2027.2.236 Sun Nov 27 16:01:00 2005 +++ php-src/NEWSSun Nov 27 16:17:17 2005 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? ??? 200?, PHP 5.1.2 +- Fixed bug #35431 (PDO crashes when using LAZY fetch with fetchAll). (Wez) - Fixed bug #35430 (PDO crashes on incorrect FETCH_FUNC use). (Tony) 28 Nov 2005, PHP 5.1.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_1) /ext/pdo package.xml
wez Sun Nov 27 16:18:25 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdopackage.xml Log: update changelog here too http://cvs.php.net/diff.php/php-src/ext/pdo/package.xml?r1=1.19.2.7r2=1.19.2.8ty=u Index: php-src/ext/pdo/package.xml diff -u php-src/ext/pdo/package.xml:1.19.2.7 php-src/ext/pdo/package.xml:1.19.2.8 --- php-src/ext/pdo/package.xml:1.19.2.7Sat Nov 26 16:22:49 2005 +++ php-src/ext/pdo/package.xml Sun Nov 27 16:18:24 2005 @@ -41,7 +41,7 @@ licensePHP/license release statestable/state - version1.0.1/version + version1.0.2/version date2005-11-26/date notes @@ -63,6 +63,9 @@ http://pecl4win.php.net ** Changes ** +- Fixed bug #35431 (PDO crashes when using LAZY fetch with fetchAll). (Wez) +- Fixed bug #35430 (PDO crashes on incorrect FETCH_FUNC use). (Tony) + - Changed PDO_XXX constants to PDO::XXX - It is now possible to extend PDO and PDOStatement and override their constructors -- 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_sqlite config.m4
tony2001Sun Nov 27 17:59:56 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_sqlite config.m4 Log: use || instead of -o to support weird systems with old `test` http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.6r2=1.26.2.7ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.6 php-src/ext/pdo_sqlite/config.m4:1.26.2.7 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.6 Mon Oct 31 22:13:32 2005 +++ php-src/ext/pdo_sqlite/config.m4Sun Nov 27 17:59:54 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.6 2005/11/01 03:13:32 wez Exp $ +dnl $Id: config.m4,v 1.26.2.7 2005/11/27 22:59:54 tony2001 Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -94,7 +94,7 @@ touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.h - if test $ext_shared = no -o $ext_srcdir != $abs_srcdir; then + if test $ext_shared = no || test $ext_srcdir != $abs_srcdir; then echo '#include php_config.h' $ext_srcdir/sqlite/src/config.h else echo #include \$abs_builddir/config.h\ $ext_srcdir/sqlite/src/config.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_sqlite config.m4
tony2001Sun Nov 27 18:00:55 2005 EDT Modified files: /php-src/ext/pdo_sqlite config.m4 Log: MF51: use || instead of -o to support weird systems with old `test` http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.28r2=1.29ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.28 php-src/ext/pdo_sqlite/config.m4:1.29 --- php-src/ext/pdo_sqlite/config.m4:1.28 Sat Sep 24 19:22:44 2005 +++ php-src/ext/pdo_sqlite/config.m4Sun Nov 27 18:00:55 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.28 2005/09/24 23:22:44 sniper Exp $ +dnl $Id: config.m4,v 1.29 2005/11/27 23:00:55 tony2001 Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -94,7 +94,7 @@ touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.h - if test $ext_shared = no -o $ext_srcdir != $abs_srcdir; then + if test $ext_shared = no || test $ext_srcdir != $abs_srcdir; then echo '#include php_config.h' $ext_srcdir/sqlite/src/config.h else echo #include \$abs_builddir/config.h\ $ext_srcdir/sqlite/src/config.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_1) /ext/ming config.m4
sniper Sun Nov 27 18:22:43 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/ming config.m4
Log:
- Fixed wrong usage of AC_TRY_COMPILE() macro
http://cvs.php.net/diff.php/php-src/ext/ming/config.m4?r1=1.22.2.3r2=1.22.2.4ty=u
Index: php-src/ext/ming/config.m4
diff -u php-src/ext/ming/config.m4:1.22.2.3 php-src/ext/ming/config.m4:1.22.2.4
--- php-src/ext/ming/config.m4:1.22.2.3 Wed Nov 23 19:51:42 2005
+++ php-src/ext/ming/config.m4 Sun Nov 27 18:22:42 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.22.2.3 2005/11/24 00:51:42 helly Exp $
+dnl $Id: config.m4,v 1.22.2.4 2005/11/27 23:22:42 sniper Exp $
dnl
PHP_ARG_WITH(ming, for MING support,
@@ -72,13 +72,13 @@
AC_DEFINE(HAVE_NEW_MING, 1, [ ])
dnl FIXME: This is now unconditional..better check coming later.
AC_DEFINE(HAVE_MING_ZLIB, 1, [ ])
-AC_TRY_COMPILE([
-#include ming.h
-int main(int,void) {
- SWFMovie_output(NULL, NULL, NULL, 0));
- return 0;
-}
- ], [ AC_DEFINE(HAVE_MING_MOVIE_LEVEL, 1, []) ])
+
+AC_TRY_COMPILE([#include ming.h],
+[
+int main(int,void) { SWFMovie_output(NULL, NULL, NULL, 0); return 0; }
+], [
+ AC_DEFINE(HAVE_MING_MOVIE_LEVEL, 1, [ ])
+], [])
])
CPPFLAGS=$old_CPPFLAGS
--
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 pdo_dbh.c php_pdo_driver.h
wez Mon Nov 28 00:23:23 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdopdo_dbh.c php_pdo_driver.h
Log:
API for connection dependent objects to add/del refs to dbh's.
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.18r2=1.82.2.19ty=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.18 php-src/ext/pdo/pdo_dbh.c:1.82.2.19
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.18 Thu Nov 24 19:20:12 2005
+++ php-src/ext/pdo/pdo_dbh.c Mon Nov 28 00:23:21 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.18 2005/11/25 00:20:12 wez Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.19 2005/11/28 05:23:21 wez Exp $ */
/* The PDO Database Handle Class */
@@ -1371,6 +1371,16 @@
pefree(dbh, dbh-is_persistent);
}
+PDO_API void php_pdo_dbh_addref(pdo_dbh_t *dbh TSRMLS_DC)
+{
+ dbh-refcount++;
+}
+
+PDO_API void php_pdo_dbh_delref(pdo_dbh_t *dbh TSRMLS_DC)
+{
+ dbh_free(dbh TSRMLS_CC);
+}
+
static void pdo_dbh_free_storage(pdo_dbh_t *dbh TSRMLS_DC)
{
if (dbh-in_txn dbh-methods dbh-methods-rollback) {
http://cvs.php.net/diff.php/php-src/ext/pdo/php_pdo_driver.h?r1=1.66.2.6r2=1.66.2.7ty=u
Index: php-src/ext/pdo/php_pdo_driver.h
diff -u php-src/ext/pdo/php_pdo_driver.h:1.66.2.6
php-src/ext/pdo/php_pdo_driver.h:1.66.2.7
--- php-src/ext/pdo/php_pdo_driver.h:1.66.2.6 Sun Oct 30 21:07:37 2005
+++ php-src/ext/pdo/php_pdo_driver.hMon Nov 28 00:23:22 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pdo_driver.h,v 1.66.2.6 2005/10/31 02:07:37 wez Exp $ */
+/* $Id: php_pdo_driver.h,v 1.66.2.7 2005/11/28 05:23:22 wez Exp $ */
#ifndef PHP_PDO_DRIVER_H
#define PHP_PDO_DRIVER_H
@@ -44,7 +44,7 @@
# define FALSE 0
#endif
-#define PDO_DRIVER_API 20051031
+#define PDO_DRIVER_API 20051128
enum pdo_param_type {
PDO_PARAM_NULL,
@@ -645,6 +645,9 @@
PDO_API void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt,
const char *sqlstate, const char *supp TSRMLS_DC);
+PDO_API void php_pdo_dbh_addref(pdo_dbh_t *dbh TSRMLS_DC);
+PDO_API void php_pdo_dbh_delref(pdo_dbh_t *dbh TSRMLS_DC);
+
PDO_API void php_pdo_stmt_addref(pdo_stmt_t *stmt TSRMLS_DC);
PDO_API void php_pdo_stmt_delref(pdo_stmt_t *stmt 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_1) /ext/pdo package.xml pdo.c
wez Mon Nov 28 01:39:55 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdopackage.xml pdo.c Log: prep for release http://cvs.php.net/diff.php/php-src/ext/pdo/package.xml?r1=1.19.2.8r2=1.19.2.9ty=u Index: php-src/ext/pdo/package.xml diff -u php-src/ext/pdo/package.xml:1.19.2.8 php-src/ext/pdo/package.xml:1.19.2.9 --- php-src/ext/pdo/package.xml:1.19.2.8Sun Nov 27 16:18:24 2005 +++ php-src/ext/pdo/package.xml Mon Nov 28 01:39:53 2005 @@ -42,7 +42,7 @@ release statestable/state version1.0.2/version - date2005-11-26/date + date2005-11-28/date notes ** NOTE WELL! ** http://cvs.php.net/diff.php/php-src/ext/pdo/pdo.c?r1=1.57.2.13r2=1.57.2.14ty=u Index: php-src/ext/pdo/pdo.c diff -u php-src/ext/pdo/pdo.c:1.57.2.13 php-src/ext/pdo/pdo.c:1.57.2.14 --- php-src/ext/pdo/pdo.c:1.57.2.13 Sat Nov 26 16:22:49 2005 +++ php-src/ext/pdo/pdo.c Mon Nov 28 01:39:53 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pdo.c,v 1.57.2.13 2005/11/26 21:22:49 wez Exp $ */ +/* $Id: pdo.c,v 1.57.2.14 2005/11/28 06:39:53 wez Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -133,7 +133,7 @@ PHP_RINIT(pdo), PHP_RSHUTDOWN(pdo), PHP_MINFO(pdo), - 1.0.1, + 1.0.2, STANDARD_MODULE_PROPERTIES }; /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
