[PHP-CVS] cvs: php4 /ext/standard var.c
wez Fri Jan 31 22:52:32 2003 EDT
Modified files:
/php4/ext/standard var.c
Log:
Don't assume that objects have class entries (in the ZE1 sense) when
determining the class name.
Additionally, don't assume that objects have a properties hash either.
Index: php4/ext/standard/var.c
diff -u php4/ext/standard/var.c:1.156 php4/ext/standard/var.c:1.157
--- php4/ext/standard/var.c:1.156 Fri Jan 31 11:24:12 2003
+++ php4/ext/standard/var.c Fri Jan 31 22:52:31 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: var.c,v 1.156 2003/01/31 16:24:12 sas Exp $ */
+/* $Id: var.c,v 1.157 2003/02/01 03:52:31 wez Exp $ */
/* {{{ includes
@@ -59,6 +59,8 @@
void php_var_dump(zval **struc, int level TSRMLS_DC)
{
HashTable *myht = NULL;
+ char *class_name;
+ zend_uint class_name_len;
if (level > 1) {
php_printf("%*c", level - 1, ' ');
@@ -92,13 +94,18 @@
goto head_done;
case IS_OBJECT:
myht = Z_OBJPROP_PP(struc);
- if (myht->nApplyCount > 1) {
+ if (myht && myht->nApplyCount > 1) {
PUTS("*RECURSION*\n");
return;
}
- php_printf("%sobject(%s)(%d) {\n", COMMON, Z_OBJCE_PP(struc)->name,
zend_hash_num_elements(myht));
+
+ Z_OBJ_HANDLER(**struc, get_class_name)(*struc, &class_name,
+&class_name_len, 0 TSRMLS_CC);
+
+ php_printf("%sobject(%s)(%d) {\n", COMMON, class_name, myht ?
+zend_hash_num_elements(myht) : 0);
head_done:
- zend_hash_apply_with_arguments(myht, (apply_func_args_t)
php_array_element_dump, 1, level);
+ if (myht) {
+ zend_hash_apply_with_arguments(myht, (apply_func_args_t)
+php_array_element_dump, 1, level);
+ }
if (level > 1) {
php_printf("%*c", level-1, ' ');
}
@@ -165,6 +172,8 @@
void php_debug_zval_dump(zval **struc, int level TSRMLS_DC)
{
HashTable *myht = NULL;
+ char *class_name;
+ zend_uint class_name_len;
if (level > 1) {
php_printf("%*c", level - 1, ' ');
@@ -194,9 +203,12 @@
goto head_done;
case IS_OBJECT:
myht = Z_OBJPROP_PP(struc);
- php_printf("%sobject(%s)(%d) refcount(%u){\n", COMMON,
Z_OBJCE_PP(struc)->name, zend_hash_num_elements(myht), Z_REFCOUNT_PP(struc));
+ Z_OBJ_HANDLER(**struc, get_class_name)(*struc, &class_name,
+&class_name_len, 0 TSRMLS_CC);
+ php_printf("%sobject(%s)(%d) refcount(%u){\n", COMMON, class_name,
+myht ? zend_hash_num_elements(myht) : 0, Z_REFCOUNT_PP(struc));
head_done:
- zend_hash_apply_with_arguments(myht, (apply_func_args_t)
zval_array_element_dump, 1, level);
+ if (myht) {
+ zend_hash_apply_with_arguments(myht, (apply_func_args_t)
+zval_array_element_dump, 1, level);
+ }
if (level > 1) {
php_printf("%*c", level-1, ' ');
}
@@ -280,6 +292,8 @@
HashTable *myht;
char* tmp_str;
int tmp_len;
+ char *class_name;
+ zend_uint class_name_len;
switch (Z_TYPE_PP(struc)) {
case IS_BOOL:
@@ -318,8 +332,11 @@
if (level > 1) {
php_printf("\n%*c", level - 1, ' ');
}
- php_printf ("class %s {\n", Z_OBJCE_PP(struc)->name);
- zend_hash_apply_with_arguments(myht, (apply_func_args_t)
php_object_element_export, 1, level);
+ Z_OBJ_HANDLER(**struc, get_class_name)(*struc, &class_name,
+&class_name_len, 0 TSRMLS_CC);
+ php_printf ("class %s {\n", class_name);
+ if (myht) {
+ zend_hash_apply_with_arguments(myht, (apply_func_args_t)
+php_object_element_export, 1, level);
+ }
if (level > 1) {
php_printf("%*c", level - 1, ' ');
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/mcrypt config.m4
msopacuaFri Jan 31 18:01:38 2003 EDT Modified files: /php4/ext/mcryptconfig.m4 Log: Require 2.5.6+ MFB: Be -ltdl aware Index: php4/ext/mcrypt/config.m4 diff -u php4/ext/mcrypt/config.m4:1.25 php4/ext/mcrypt/config.m4:1.26 --- php4/ext/mcrypt/config.m4:1.25 Fri Jan 3 14:49:44 2003 +++ php4/ext/mcrypt/config.m4 Fri Jan 31 18:01:36 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25 2003/01/03 19:49:44 derick Exp $ +dnl $Id: config.m4,v 1.26 2003/01/31 23:01:36 msopacua Exp $ dnl AC_DEFUN(PHP_MCRYPT_CHECK_VERSION,[ @@ -8,13 +8,13 @@ AC_MSG_CHECKING(for libmcrypt version) AC_EGREP_CPP(yes,[ #include -#if MCRYPT_API_VERSION >= 20020309 +#if MCRYPT_API_VERSION >= 20021217 yes #endif ],[ -AC_MSG_RESULT(>= 2.5.3) +AC_MSG_RESULT(>= 2.5.6) ],[ -AC_MSG_ERROR(libmcrypt version 2.5.3 or greater required.) +AC_MSG_ERROR(libmcrypt version 2.5.6 or greater required.) ]) CPPFLAGS=$old_CPPFLAGS ]) @@ -36,10 +36,27 @@ PHP_MCRYPT_CHECK_VERSION - PHP_ADD_LIBRARY(ltdl,, MCRYPT_SHARED_LIBADD) + PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open, + [ +PHP_ADD_LIBRARY(ltdl,, MCRYPT_SHARED_LIBADD) +AC_DEFINE(HAVE_LIBMCRYPT,1,[ ]) + ],[ +unset found +unset ac_cv_lib_mcrypt_mcrypt_module_open +PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open, +[ + AC_DEFINE(HAVE_LIBMCRYPT,1,[ ]) +],[ + AC_MSG_ERROR([Sorry, I was not able to diagnose which libmcrypt version you +have installed.]) +],[ + -L$MCRYPT_DIR/lib +]) + ],[ +-L$MCRYPT_DIR/lib -lltdl + ]) + PHP_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib, MCRYPT_SHARED_LIBADD) PHP_ADD_INCLUDE($MCRYPT_DIR/include) - AC_DEFINE(HAVE_LIBMCRYPT,1,[ ]) PHP_SUBST(MCRYPT_SHARED_LIBADD) PHP_NEW_EXTENSION(mcrypt, mcrypt.c, $ext_shared) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/openssl openssl.c
iliaa Fri Jan 31 17:27:27 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/openssl openssl.c
Log:
MFH
Index: php4/ext/openssl/openssl.c
diff -u php4/ext/openssl/openssl.c:1.52.2.6 php4/ext/openssl/openssl.c:1.52.2.7
--- php4/ext/openssl/openssl.c:1.52.2.6 Tue Dec 31 11:35:05 2002
+++ php4/ext/openssl/openssl.c Fri Jan 31 17:27:27 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.52.2.6 2002/12/31 16:35:05 sebastian Exp $ */
+/* $Id: openssl.c,v 1.52.2.7 2003/01/31 22:27:27 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1728,27 +1728,23 @@
}
else{
/* we want the private key */
+ BIO *in;
+
if (filename) {
- BIO *in;
if (php_openssl_safe_mode_chk(filename TSRMLS_CC)) {
return NULL;
}
in = BIO_new_file(filename, "r");
- if (in == NULL)
- return NULL;
- key = PEM_read_bio_PrivateKey(in, NULL,NULL,
passphrase);
- BIO_free(in);
+ } else {
+ in = BIO_new_mem_buf(Z_STRVAL_PP(val),
+Z_STRLEN_PP(val));
}
- else{
- BIO * b = BIO_new_mem_buf(Z_STRVAL_PP(val),
Z_STRLEN_PP(val));
- if (b == NULL)
- return NULL;
- key = (EVP_PKEY *) PEM_ASN1_read_bio((char
*(*)())d2i_PrivateKey,
- PEM_STRING_EVP_PKEY, b,
- NULL, NULL, passphrase);
- BIO_free(b);
+ if (in == NULL) {
+ return NULL;
}
+
+ key = PEM_read_bio_PrivateKey(in, NULL,NULL, passphrase);
+ BIO_free(in);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/openssl openssl.c
iliaa Fri Jan 31 17:15:56 2003 EDT
Modified files:
/php4/ext/openssl openssl.c
Log:
Fixed bug #21986 (openssl test failure).
Index: php4/ext/openssl/openssl.c
diff -u php4/ext/openssl/openssl.c:1.63 php4/ext/openssl/openssl.c:1.64
--- php4/ext/openssl/openssl.c:1.63 Sat Jan 18 14:41:38 2003
+++ php4/ext/openssl/openssl.c Fri Jan 31 17:15:55 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.63 2003/01/18 19:41:38 iliaa Exp $ */
+/* $Id: openssl.c,v 1.64 2003/01/31 22:15:55 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1726,27 +1726,22 @@
}
} else {
/* we want the private key */
+ BIO *in;
+
if (filename) {
- BIO *in;
if (php_openssl_safe_mode_chk(filename TSRMLS_CC)) {
return NULL;
}
in = BIO_new_file(filename, "r");
- if (in == NULL) {
- return NULL;
- }
- key = PEM_read_bio_PrivateKey(in, NULL,NULL,
passphrase);
- BIO_free(in);
} else {
- BIO *b = BIO_new_mem_buf(Z_STRVAL_PP(val),
Z_STRLEN_PP(val));
- if (b == NULL) {
- return NULL;
- }
- key = (EVP_PKEY *) PEM_ASN1_read_bio((char
*(*)())d2i_PrivateKey,
- PEM_STRING_EVP_PKEY, b,
- NULL, NULL, passphrase);
- BIO_free(b);
+ in = BIO_new_mem_buf(Z_STRVAL_PP(val),
+Z_STRLEN_PP(val));
+ }
+
+ if (in == NULL) {
+ return NULL;
}
+ key = PEM_read_bio_PrivateKey(in, NULL,NULL, passphrase);
+ BIO_free(in);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/dba dba.c dba_cdb.c dba_db2.c dba_db3.c dba_db4.c dba_dbm.c dba_flatfile.c dba_gdbm.c dba_ndbm.c php_dba.h /ext/dba/libcdb cdb.c cdb.h cdb_make.c cdb_make.h /ext/dba/libflatfile flatfile.c flatfile.h
helly Fri Jan 31 15:10:11 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/dba dba.c dba_cdb.c dba_db2.c dba_db3.c dba_db4.c
dba_dbm.c dba_flatfile.c dba_gdbm.c dba_ndbm.c
php_dba.h
/php4/ext/dba/libcdbcdb.c cdb.h cdb_make.c cdb_make.h
/php4/ext/dba/libflatfile flatfile.c flatfile.h
Log:
MFH: Version info
Index: php4/ext/dba/dba.c
diff -u php4/ext/dba/dba.c:1.61.2.11 php4/ext/dba/dba.c:1.61.2.12
--- php4/ext/dba/dba.c:1.61.2.11Tue Dec 31 11:34:17 2002
+++ php4/ext/dba/dba.c Fri Jan 31 15:10:10 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dba.c,v 1.61.2.11 2002/12/31 16:34:17 sebastian Exp $ */
+/* $Id: dba.c,v 1.61.2.12 2003/01/31 20:10:10 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -147,7 +147,7 @@
{\
#alias, flags, dba_open_##name, dba_close_##name, dba_fetch_##name,
dba_update_##name, \
dba_exists_##name, dba_delete_##name, dba_firstkey_##name, dba_nextkey_##name,
\
- dba_optimize_##name, dba_sync_##name \
+ dba_optimize_##name, dba_sync_##name, dba_info_##name \
},
#define DBA_HND(name, flags) DBA_NAMED_HND(name, name, flags)
@@ -191,7 +191,7 @@
#if DBA_FLATFILE
DBA_HND(flatfile, DBA_STREAM_OPEN|DBA_LOCK_ALL) /* No lock in lib */
#endif
- { NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
+ { NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
};
static int le_db;
@@ -750,23 +750,26 @@
}
/* }}} */
-/* {{{ proto array dba_handlers()
+/* {{{ proto array dba_handlers([bool full_info])
List configured databases */
PHP_FUNCTION(dba_handlers)
{
dba_handler *hptr;
+ zend_bool full_info = 0;
- if (ZEND_NUM_ARGS()!=0) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &full_info) ==
+FAILURE) {
ZEND_WRONG_PARAM_COUNT();
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Unable to initialize
array");
- RETURN_FALSE;
- }
+ array_init(return_value);
+
for(hptr = handler; hptr->name; hptr++) {
- add_next_index_string(return_value, hptr->name, 1);
+ if (full_info) {
+ add_assoc_string(return_value, hptr->name, hptr->info(hptr,
+NULL TSRMLS_CC), 0);
+ } else {
+ add_next_index_string(return_value, hptr->name, 1);
+ }
}
}
/* }}} */
@@ -784,10 +787,8 @@
RETURN_FALSE;
}
- if (array_init(return_value) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Unable to initialize
array");
- RETURN_FALSE;
- }
+ array_init(return_value);
+
numitems = zend_hash_next_free_element(&EG(regular_list));
for (i=1; iname, "cdb")) {
+ return estrdup(cdb_version());
+ } else {
+ return estrdup(cdb_make_version());
+ }
+#else
+ return estrdup("External");
+#endif
}
#endif
Index: php4/ext/dba/dba_db2.c
diff -u php4/ext/dba/dba_db2.c:1.30.2.2 php4/ext/dba/dba_db2.c:1.30.2.3
--- php4/ext/dba/dba_db2.c:1.30.2.2 Tue Dec 31 11:34:18 2002
+++ php4/ext/dba/dba_db2.c Fri Jan 31 15:10:11 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dba_db2.c,v 1.30.2.2 2002/12/31 16:34:18 sebastian Exp $ */
+/* $Id: dba_db2.c,v 1.30.2.3 2003/01/31 20:10:11 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -186,6 +186,11 @@
DB2_DATA;
return dba->dbp->sync(dba->dbp, 0) ? FAILURE : SUCCESS;
+}
+
+DBA_INFO_FUNC(db2)
+{
+ return estrdup(DB_VERSION_STRING);
}
#endif
Index: php4/ext/dba/dba_db3.c
diff -u php4/ext/dba/dba_db3.c:1.21.2.4 php4/ext/dba/dba_db3.c:1.21.2.5
--- php4/ext/dba/dba_db3.c:1.21.2.4 Tue Dec 31 11:34:18 2002
+++ php4/ext/dba/dba_db3.c Fri Jan 31 15:10:11 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dba_db3.c,v 1.21.2.4 2002/12/31 16:34:18 sebastian Exp $ */
+/* $Id: dba_db3.c,v 1.21.2.5 2003/01/31 20:10:11 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -215,6 +215,11 @@
DB3_DATA;
return dba->dbp->sync(dba->dbp, 0) ? FAILURE : SUCCESS;
+}
+
+DBA_INFO_FUNC(db3)
+{
+ return estrdup(DB_VERSION_STRING);
}
#endif
Index: php4/ext/dba/dba_db4.c
diff -u php4/ext/dba/dba_db4.c:1.6.2.2 php4/ext/dba/dba_db4.c:1.6.2.3
--- php4/ext/dba/dba_db4.c:1.6.2.2 Tue Dec 31 11:34:18 2002
+++ php4/ext/dba/dba_db4.c Fri Jan 31 15:10:11 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dba_db4.c,v 1.6.2.2 2002/
[PHP-CVS] cvs: php4(PHP_4_3) /ext/dba config.m4
helly Fri Jan 31 15:07:23 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/dba config.m4 Log: MFH: Shared dba requires at least db-3.3 Index: php4/ext/dba/config.m4 diff -u php4/ext/dba/config.m4:1.29.2.9 php4/ext/dba/config.m4:1.29.2.10 --- php4/ext/dba/config.m4:1.29.2.9 Thu Jan 30 16:38:15 2003 +++ php4/ext/dba/config.m4 Fri Jan 31 15:07:23 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.29.2.9 2003/01/30 21:38:15 helly Exp $ +dnl $Id: config.m4,v 1.29.2.10 2003/01/31 20:07:23 helly Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -165,6 +165,19 @@ AC_MSG_RESULT(ok) ],[ AC_MSG_ERROR(Version 4.1 requires patch level 25) +]) + fi + if test "$ext_shared" = "yes"; then +AC_MSG_CHECKING(if db can be used as shared extension) +AC_EGREP_CPP(yes,[ +#include "$THIS_INCLUDE" +#if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2) + yes +#endif +],[ + AC_MSG_RESULT(yes) +],[ + AC_MSG_ERROR(At least version 3.3 is required) ]) fi if test -n "$THIS_LIBS"; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dba config.m4
helly Fri Jan 31 15:06:44 2003 EDT Modified files: /php4/ext/dba config.m4 Log: Shared dba requires at least db-3.3 Index: php4/ext/dba/config.m4 diff -u php4/ext/dba/config.m4:1.40 php4/ext/dba/config.m4:1.41 --- php4/ext/dba/config.m4:1.40 Thu Jan 30 16:36:05 2003 +++ php4/ext/dba/config.m4 Fri Jan 31 15:06:44 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.40 2003/01/30 21:36:05 helly Exp $ +dnl $Id: config.m4,v 1.41 2003/01/31 20:06:44 helly Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -165,6 +165,19 @@ AC_MSG_RESULT(ok) ],[ AC_MSG_ERROR(Version 4.1 requires patch level 25) +]) + fi + if test "$ext_shared" = "yes"; then +AC_MSG_CHECKING(if db can be used as shared extension) +AC_EGREP_CPP(yes,[ +#include "$THIS_INCLUDE" +#if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2) + yes +#endif +],[ + AC_MSG_RESULT(yes) +],[ + AC_MSG_ERROR(At least version 3.3 is required) ]) fi if test -n "$THIS_LIBS"; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dba dba.c
helly Fri Jan 31 14:12:24 2003 EDT
Modified files:
/php4/ext/dba dba.c
Log:
Fix proto
Index: php4/ext/dba/dba.c
diff -u php4/ext/dba/dba.c:1.81 php4/ext/dba/dba.c:1.82
--- php4/ext/dba/dba.c:1.81 Sat Jan 18 14:49:25 2003
+++ php4/ext/dba/dba.c Fri Jan 31 14:12:23 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dba.c,v 1.81 2003/01/18 19:49:25 iliaa Exp $ */
+/* $Id: dba.c,v 1.82 2003/01/31 19:12:23 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -682,7 +682,7 @@
/* }}} */
#undef FREENOW
-/* {{{ proto int dba_popen(string path [, string mode, string handlername, string
...])
+/* {{{ proto int dba_popen(string path, string mode [, string handlername, string
+...])
Opens path using the specified handler in mode persistently */
PHP_FUNCTION(dba_popen)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /ext ext_skel.php
At 19:37 31.01.2003, Jani Taskinen wrote: Just remove/add (stupid CVS..why can't it have 'rename'..) Just wait a while and we can hpefully switch to subversion. That would also enable directory removal :-) regards marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext ext_skel.php ext_skel_win32.php
fmk Fri Jan 31 13:51:29 2003 EDT Removed files: /php4/ext ext_skel.php Modified files: /php4/ext ext_skel_win32.php Log: Rename script. Add check for CLI version Index: php4/ext/ext_skel_win32.php diff -u /dev/null php4/ext/ext_skel_win32.php:1.2 --- /dev/null Fri Jan 31 13:51:29 2003 +++ php4/ext/ext_skel_win32.php Fri Jan 31 13:51:28 2003 @@ -0,0 +1,52 @@ + \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext ext_skel.php ext_skel_win32.php
fmk Fri Jan 31 13:50:41 2003 EDT Added files: (Branch: PHP_4_3) /php4/ext ext_skel_win32.php Removed files: /php4/ext ext_skel.php Log: Rename script. Add check for CLI version Index: php4/ext/ext_skel_win32.php +++ php4/ext/ext_skel_win32.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /ext ext_skel.php
On Fri, 31 Jan 2003, Frank M. Kromann wrote: >Hi Jani, > >I just wanted it to follow the existing documentation on how to use >ext_skel, but I have no problem renaming it. Do you have access to do so >on the CVS server or should I remove the old files and add them with a new >name ? Just remove/add (stupid CVS..why can't it have 'rename'..) --Jani >- Frank > >> >> Why don't you call it that then? ext_skel_win32.php or something..? >> >> >> >> On Fri, 31 Jan 2003, Frank M. Kromann wrote: >> >> >fmk Thu Jan 30 20:01:53 2003 EDT >> > >> > Added files: (Branch: PHP_4_3) >> >/php4/ext ext_skel.php >> > Log: >> > Wrapper script to execute ext_skel on WIn32 >> > >> > >> >Index: php4/ext/ext_skel.php >> >+++ php4/ext/ext_skel.php >> > >> > >> > >> > >> >> -- >> <- For Sale! -> >> >> > > -- <- For Sale! -> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /ext ext_skel.php
Hi Jani, I just wanted it to follow the existing documentation on how to use ext_skel, but I have no problem renaming it. Do you have access to do so on the CVS server or should I remove the old files and add them with a new name ? - Frank > > Why don't you call it that then? ext_skel_win32.php or something..? > > > > On Fri, 31 Jan 2003, Frank M. Kromann wrote: > > >fmk Thu Jan 30 20:01:53 2003 EDT > > > > Added files: (Branch: PHP_4_3) > >/php4/extext_skel.php > > Log: > > Wrapper script to execute ext_skel on WIn32 > > > > > >Index: php4/ext/ext_skel.php > >+++ php4/ext/ext_skel.php > > > > > > > > > > -- > <- For Sale! -> > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard var.c
sas Fri Jan 31 11:24:12 2003 EDT
Modified files:
/php4/ext/standard var.c
Log:
Unbreak $Id tag
Index: php4/ext/standard/var.c
diff -u php4/ext/standard/var.c:1.155 php4/ext/standard/var.c:1.156
--- php4/ext/standard/var.c:1.155 Sat Jan 18 10:03:01 2003
+++ php4/ext/standard/var.c Fri Jan 31 11:24:12 2003
@@ -18,8 +18,7 @@
+--+
*/
-/* $Id: var.c
- 1.111 2001/08/06 13:36:08 thies Exp $ */
+/* $Id: var.c,v 1.156 2003/01/31 16:24:12 sas Exp $ */
/* {{{ includes
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/mcrypt config.m4
msopacuaFri Jan 31 10:06:46 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/mcryptconfig.m4 Log: "The ugly patch" Make mcrypt compile, when we finally are free of -ltdl. Bug #20926. # There's a variant, with a config option, but that's an ugly word(tm) Index: php4/ext/mcrypt/config.m4 diff -u php4/ext/mcrypt/config.m4:1.24 php4/ext/mcrypt/config.m4:1.24.4.1 --- php4/ext/mcrypt/config.m4:1.24 Tue Mar 12 11:24:05 2002 +++ php4/ext/mcrypt/config.m4 Fri Jan 31 10:06:45 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.24 2002/03/12 16:24:05 sas Exp $ +dnl $Id: config.m4,v 1.24.4.1 2003/01/31 15:06:45 msopacua Exp $ dnl PHP_ARG_WITH(mcrypt, for mcrypt support, @@ -29,15 +29,28 @@ ]) ],[ -PHP_CHECK_LIBRARY(mcrypt, init_mcrypt, +unset found +unset ac_cv_lib_mcrypt_mcrypt_module_open +PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open, [ - AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) -],[ - AC_MSG_ERROR([Sorry, I was not able to diagnose which libmcrypt version you have installed.]) -],[ - -L$MCRYPT_DIR/lib -]) + AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ]) + PHP_CHECK_LIBRARY(mcrypt, mcrypt_generic_deinit, + [ +AC_DEFINE(HAVE_MCRYPT_GENERIC_DEINIT,1,[ ]) + ],[],[ +-L$MCRYPT_DIR/lib + ]) +],[ + PHP_CHECK_LIBRARY(mcrypt, init_mcrypt, + [ +AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) + ],[ +AC_MSG_ERROR([Sorry, I was not able to diagnose which libmcrypt version you +have installed.]) + ],[ +-L$MCRYPT_DIR/lib + ]) +],[]) ],[ -L$MCRYPT_DIR/lib -lltdl ]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/mbstring mbfilter.c mbstring.c /ext/mbstring/tests mb_send_mail01.phpt mb_send_mail02.phpt mb_send_mail03.phpt mb_send_mail04.phpt mb_send_mail05.phpt mb_send_mail06.phpt
moriyoshi Fri Jan 31 09:28:44 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/mbstring mbfilter.c mbstring.c
/php4/ext/mbstring/testsmb_send_mail01.phpt mb_send_mail02.phpt
mb_send_mail03.phpt mb_send_mail04.phpt
mb_send_mail05.phpt mb_send_mail06.phpt
Log:
MFH: fixed a mb_send_mail() bug.
# sorry for mixing WS fix
Index: php4/ext/mbstring/mbfilter.c
diff -u php4/ext/mbstring/mbfilter.c:1.52 php4/ext/mbstring/mbfilter.c:1.52.2.1
--- php4/ext/mbstring/mbfilter.c:1.52 Wed Nov 13 06:57:59 2002
+++ php4/ext/mbstring/mbfilter.cFri Jan 31 09:28:43 2003
@@ -80,7 +80,7 @@
*
*/
-/* $Id: mbfilter.c,v 1.52 2002/11/13 11:57:59 moriyoshi Exp $ */
+/* $Id: mbfilter.c,v 1.52.2.1 2003/01/31 14:28:43 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -7440,8 +7440,10 @@
if (filter1 == NULL) {
return NULL;
}
- filter2->illegal_mode = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
- filter2->illegal_substchar = 0x3f; /* '?' */
+ if (filter2 != NULL) {
+ filter2->illegal_mode = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
+ filter2->illegal_substchar = 0x3f; /* '?' */
+ }
mbfl_memory_device_init(&device, string->len, (string->len >> 2) + 8
TSRMLS_CC);
/* feed data */
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.142.2.5 php4/ext/mbstring/mbstring.c:1.142.2.6
--- php4/ext/mbstring/mbstring.c:1.142.2.5 Sun Nov 24 14:21:58 2002
+++ php4/ext/mbstring/mbstring.cFri Jan 31 09:28:44 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.5 2002/11/24 19:21:58 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.6 2003/01/31 14:28:44 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -3375,11 +3375,21 @@
|| orig_str.no_encoding == mbfl_no_encoding_pass) {
orig_str.no_encoding = mbfl_identify_encoding_no(&orig_str,
MBSTRG(current_detect_order_list), MBSTRG(current_detect_order_list_size) TSRMLS_CC);
}
- pstr = mbfl_convert_encoding(&orig_str, &conv_str, tran_cs TSRMLS_CC);
+
+ pstr = NULL;
+ {
+ mbfl_string tmpstr;
+
+ if (mbfl_convert_encoding(&orig_str, &tmpstr, tran_cs
+TSRMLS_CC) != NULL) {
+ tmpstr.no_encoding=mbfl_no_encoding_8bit;
+ pstr = mbfl_convert_encoding(&tmpstr, &conv_str,
+body_enc TSRMLS_CC);
+ efree(tmpstr.val);
+ }
+ }
if (pstr != NULL) {
message_buf = message = (char *)pstr->val;
} else {
- message = Z_STRVAL_PP(argv[2]);
+ message = estrndup(Z_STRVAL_PP(argv[2]), Z_STRLEN_PP(argv[2]));
}
} else {
/* this is not really an error, so it is allowed. */
Index: php4/ext/mbstring/tests/mb_send_mail01.phpt
diff -u php4/ext/mbstring/tests/mb_send_mail01.phpt:1.1.2.1
php4/ext/mbstring/tests/mb_send_mail01.phpt:1.1.2.2
--- php4/ext/mbstring/tests/mb_send_mail01.phpt:1.1.2.1 Thu Nov 21 13:19:27 2002
+++ php4/ext/mbstring/tests/mb_send_mail01.phpt Fri Jan 31 09:28:44 2003
@@ -28,11 +28,11 @@
Content-Type: text/plain; charset=%s
Content-Transfer-Encoding: %s
-test
+dGVzdA==
To: [EMAIL PROTECTED]
Subject: test neutral
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: BASE64
-test
+dGVzdA==
Index: php4/ext/mbstring/tests/mb_send_mail02.phpt
diff -u php4/ext/mbstring/tests/mb_send_mail02.phpt:1.2
php4/ext/mbstring/tests/mb_send_mail02.phpt:1.2.2.1
--- php4/ext/mbstring/tests/mb_send_mail02.phpt:1.2 Wed Nov 13 03:27:17 2002
+++ php4/ext/mbstring/tests/mb_send_mail02.phpt Fri Jan 31 09:28:44 2003
@@ -28,7 +28,7 @@
Content-Type: text/plain; charset=%s
Content-Transfer-Encoding: %s
-test
+dGVzdA==
To: [EMAIL PROTECTED]
Subject: =?ISO-2022-JP?B?GyRCJUYlOSVIGyhCIEphcGFuZXNl?=
Mime-Version: 1.0
Index: php4/ext/mbstring/tests/mb_send_mail03.phpt
diff -u php4/ext/mbstring/tests/mb_send_mail03.phpt:1.2.2.1
php4/ext/mbstring/tests/mb_send_mail03.phpt:1.2.2.2
--- php4/ext/mbstring/tests/mb_send_mail03.phpt:1.2.2.1 Thu Nov 21 13:19:27 2002
+++ php4/ext/mbstring/tests/mb_send_mail03.phpt Fri Jan 31 09:28:44 2003
@@ -1,38 +1,38 @@
---TEST--
-mb_send_mail() test 3 (lang=English)
---SKIPIF--
-
---INI--
-sendmail_path=cat
---FILE--
-
---EXPECTF--
-To: [EMAIL PROTECTED]
-Subject: %s
-Mime-Version: 1.0
-Content-Type: text/plain; charset=%s
-Content-Transfer-Encoding: %s
-
-test
-To: [EMAIL PROTECTED]
-Subject: test English
-Mime-Version: 1.0
-Content-Type: text/plain; charset=%s-8859-1
-Content-Trans
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
sniper Fri Jan 31 09:23:57 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: Moved from HEAD. Index: php4/NEWS diff -u php4/NEWS:1.1247.2.56 php4/NEWS:1.1247.2.57 --- php4/NEWS:1.1247.2.56 Wed Jan 29 03:08:25 2003 +++ php4/NEWS Fri Jan 31 09:23:56 2003 @@ -11,6 +11,9 @@ . Disallow configuring of more than one Berkeley db handler. - Added --clean option into phpize. (Jani) - Added --ldflags option into php-config. (Jani) +- Added OCIPasswordChange() which allows renewing expired Oracle users. (Maxim) +- Fixed bug #17448 (Print the message when OCI_SUCCESS_WITH_INFO is returned). + (Maxim) - Fixed bug #13561 (--without-pear disabled phpize/php-config install). (Jani) - Fixed bug #14532 (fixed connection_status() to return 2 for timeouts). (Jani) - Fixed bug #17098 (make Apache2 aware that PHP scripts should not be cached). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
sniper Fri Jan 31 09:23:19 2003 EDT Modified files: /php4 NEWS Log: Moved these entries to PHP_4_3 branch NEWS (for 4.3.1) Index: php4/NEWS diff -u php4/NEWS:1.1311 php4/NEWS:1.1312 --- php4/NEWS:1.1311Wed Jan 29 02:50:09 2003 +++ php4/NEWS Fri Jan 31 09:23:18 2003 @@ -1,8 +1,6 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 5.0.0 -- Fixed bug #17448 (Print the message when OCI_SUCCESS_WITH_INFO is returned). - (Maxim) - Fixed bug #20155 (xmlrpc compile problem with ZE2). (Derick, Jan Schneider) - Fixed bug #20442 (upgraded bundled expat to 1.95.5). (Ilia) - Changed ext/mcrypt to require libmcrypt version 2.5.3 or greater. (Derick) @@ -10,7 +8,6 @@ (Marcus) - Improved JPEG 2000 support for getimagesize(). (Marcus, Adam Wright) - Improved array_search() to accept objects as a needle under ZE2. (Moriyoshi) -- Added OCIPasswordChange() which allows renewing expired Oracle users. (Maxim) - Added string.base64 stream filter. (Moriyoshi) - Added domxml_node_get_path() (Lukas Schröder) - Added iconv related functions (Moriyoshi) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/oci8 CREDITS config.m4 oci8.c php_oci8.h
sniper Fri Jan 31 09:21:19 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/oci8 CREDITS config.m4 oci8.c php_oci8.h
Log:
MFH all changes as requested by Maxim.
Index: php4/ext/oci8/CREDITS
diff -u php4/ext/oci8/CREDITS:1.3 php4/ext/oci8/CREDITS:1.3.12.1
--- php4/ext/oci8/CREDITS:1.3 Sat Apr 14 04:38:46 2001
+++ php4/ext/oci8/CREDITS Fri Jan 31 09:21:19 2003
@@ -1,2 +1,2 @@
OCI8
-Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson
+Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson, Maxim Maletsky
Index: php4/ext/oci8/config.m4
diff -u php4/ext/oci8/config.m4:1.37.2.1 php4/ext/oci8/config.m4:1.37.2.2
--- php4/ext/oci8/config.m4:1.37.2.1Fri Jan 24 12:51:40 2003
+++ php4/ext/oci8/config.m4 Fri Jan 31 09:21:19 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.37.2.1 2003/01/24 17:51:40 sniper Exp $
+dnl $Id: config.m4,v 1.37.2.2 2003/01/31 14:21:19 sniper Exp $
dnl
AC_DEFUN(PHP_OCI_IF_DEFINED,[
@@ -86,18 +86,31 @@
PHP_ADD_LIBRARY_WITH_PATH(clntsh, $OCI8_DIR/lib, OCI8_SHARED_LIBADD)
;;
-8.1|9.0)
+8.1)
PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
if test -f $OCI8_DIR/lib/libocijdbc8.so ; then
PHP_ADD_LIBRARY(ocijdbc8, 1, OCI8_SHARED_LIBADD)
fi
PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
+ AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
+ AC_DEFINE(HAVE_OCI8_SHARED_MODE,1,[ ])
dnl
- dnl OCI_ATTR_STATEMENT is not always available
+ dnl OCI_ATTR_STATEMENT is not available in all 8.1.x versions
dnl
PHP_OCI_IF_DEFINED(OCI_ATTR_STATEMENT, [AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[
])], $OCI8_INCLUDES)
+ ;;
+
+9.0)
+ PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
+ if test -f $OCI8_DIR/lib/libocijdbc8.so ; then
+PHP_ADD_LIBRARY(ocijdbc8, 1, OCI8_SHARED_LIBADD)
+ fi
+ PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
+ AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
+ AC_DEFINE(HAVE_OCI8_SHARED_MODE,1,[ ])
+ AC_DEFINE(HAVE_OCI9,1,[ ])
;;
*)
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.183.2.1 php4/ext/oci8/oci8.c:1.183.2.2
--- php4/ext/oci8/oci8.c:1.183.2.1 Tue Dec 31 11:35:03 2002
+++ php4/ext/oci8/oci8.cFri Jan 31 09:21:19 2003
@@ -14,13 +14,14 @@
+--+
| Authors: Stig Sæther Bakken <[EMAIL PROTECTED]>|
| Thies C. Arntzen <[EMAIL PROTECTED]> |
+ | Maxim Maletsky <[EMAIL PROTECTED]> |
| |
| Collection support by Andy Sautins <[EMAIL PROTECTED]> |
| Temporary LOB support by David Benson <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: oci8.c,v 1.183.2.1 2002/12/31 16:35:03 sebastian Exp $ */
+/* $Id: oci8.c,v 1.183.2.2 2003/01/31 14:21:19 sniper Exp $ */
/* TODO list:
*
@@ -28,7 +29,6 @@
* especialliy important for things like oci_ping
* - Change return-value for OCIFetch*() (1-row read, 0-Normal end, false-error)
* - Error mode (print or shut up?)
- * - OCIPasswordChange()
* - binding of arrays
* - Character sets for NCLOBS
* - split the module into an upper (php-callable) and lower (c-callable) layer!
@@ -48,7 +48,7 @@
* - delay OCIInitialize() as far as we can.
* - add PHP Array <-> OCICollection conversion
* - add Collection iterator object for INDEX BY tables
- * - make auto-rollabck only happen if we have an outstanding transaction
+ * - make auto-rollback only happen if we have an outstanding transaction
* - implement ocidisconnect
*/
@@ -69,14 +69,14 @@
#include "php_oci8.h"
/* True globals, no need for thread safety */
-static int le_conn;
-static int le_stmt;
-static int le_desc;
+static int le_conn;
+static int le_stmt;
+static int le_desc;
#ifdef WITH_COLLECTIONS
-static int le_coll;
+static int le_coll;
#endif
-static int le_server;
-static int le_session;
+static int le_server;
+static int le_session;
static zend_class_entry *oci_lob_class_entry_ptr;
#ifdef WITH_COLLECTIONS
static zend_class_entry *oci_coll_class_entry_ptr;
@@ -102,7 +102,7 @@
#define CALL_OCI(call) \
{ \
if (OCI(in_call)) { \
- php_error(E_WARNING, "OCI8 Recursive call!\n"); \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI8 Recursive call!\n");
+\
exit(-1); \
} else { \
OCI(in_call)=1; \
@@ -115,7 +115,7 @@
{ \
if (OCI(in_call)) { \
retcode=-1; \
- php_error(E_WARNING, "OCI8 Recursive call!\n"); \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI8 Recursive call!\n");
+\
exit(-1); \
} el
[PHP-CVS] cvs: php4 /ext/oci8 php_oci8.h
sniper Fri Jan 31 09:18:50 2003 EDT
Modified files:
/php4/ext/oci8 php_oci8.h
Log:
No c++ comments..
Index: php4/ext/oci8/php_oci8.h
diff -u php4/ext/oci8/php_oci8.h:1.26 php4/ext/oci8/php_oci8.h:1.27
--- php4/ext/oci8/php_oci8.h:1.26 Tue Dec 31 11:07:07 2002
+++ php4/ext/oci8/php_oci8.hFri Jan 31 09:18:50 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_oci8.h,v 1.26 2002/12/31 16:07:07 sebastian Exp $ */
+/* $Id: php_oci8.h,v 1.27 2003/01/31 14:18:50 sniper Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_H
@@ -70,8 +70,8 @@
char *hashed_details;
oci_server *server;
OCISession *pSession;
- OCIEnv *pEnv; //sessions own environment
- ub2 charsetId; //sessions used character set (mostly
this will be 0, so NLS_LANG will be used.
+ OCIEnv *pEnv; /* sessions own environment */
+ ub2 charsetId; /* sessions used character set (mostly
+this will be 0, so NLS_LANG will be used. */
} oci_session;
typedef struct {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/mbstring mbfilter.c mbstring.c /ext/mbstring/tests mb_send_mail01.phpt mb_send_mail02.phpt mb_send_mail03.phpt mb_send_mail04.phpt mb_send_mail05.phpt mb_send_mail06.phpt mb_send_mail07.phpt
moriyoshi Fri Jan 31 09:15:50 2003 EDT
Modified files:
/php4/ext/mbstring mbfilter.c mbstring.c
/php4/ext/mbstring/testsmb_send_mail01.phpt mb_send_mail02.phpt
mb_send_mail03.phpt mb_send_mail04.phpt
mb_send_mail05.phpt mb_send_mail06.phpt
mb_send_mail07.phpt
Log:
Fixed a mb_send_mail() bug that has been reported in [EMAIL PROTECTED]
See http://lists.php.net/article.php?group=php.i18n&article=427
Index: php4/ext/mbstring/mbfilter.c
diff -u php4/ext/mbstring/mbfilter.c:1.52 php4/ext/mbstring/mbfilter.c:1.53
--- php4/ext/mbstring/mbfilter.c:1.52 Wed Nov 13 06:57:59 2002
+++ php4/ext/mbstring/mbfilter.cFri Jan 31 09:15:49 2003
@@ -80,7 +80,7 @@
*
*/
-/* $Id: mbfilter.c,v 1.52 2002/11/13 11:57:59 moriyoshi Exp $ */
+/* $Id: mbfilter.c,v 1.53 2003/01/31 14:15:49 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -7440,8 +7440,10 @@
if (filter1 == NULL) {
return NULL;
}
- filter2->illegal_mode = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
- filter2->illegal_substchar = 0x3f; /* '?' */
+ if (filter2 != NULL) {
+ filter2->illegal_mode = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
+ filter2->illegal_substchar = 0x3f; /* '?' */
+ }
mbfl_memory_device_init(&device, string->len, (string->len >> 2) + 8
TSRMLS_CC);
/* feed data */
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.155 php4/ext/mbstring/mbstring.c:1.156
--- php4/ext/mbstring/mbstring.c:1.155 Tue Jan 21 09:53:16 2003
+++ php4/ext/mbstring/mbstring.cFri Jan 31 09:15:49 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.155 2003/01/21 14:53:16 iliaa Exp $ */
+/* $Id: mbstring.c,v 1.156 2003/01/31 14:15:49 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -2830,11 +2830,21 @@
|| orig_str.no_encoding == mbfl_no_encoding_pass) {
orig_str.no_encoding = mbfl_identify_encoding_no(&orig_str,
MBSTRG(current_detect_order_list), MBSTRG(current_detect_order_list_size) TSRMLS_CC);
}
- pstr = mbfl_convert_encoding(&orig_str, &conv_str, tran_cs TSRMLS_CC);
+
+ pstr = NULL;
+ {
+ mbfl_string tmpstr;
+
+ if (mbfl_convert_encoding(&orig_str, &tmpstr, tran_cs
+TSRMLS_CC) != NULL) {
+ tmpstr.no_encoding=mbfl_no_encoding_8bit;
+ pstr = mbfl_convert_encoding(&tmpstr, &conv_str,
+body_enc TSRMLS_CC);
+ efree(tmpstr.val);
+ }
+ }
if (pstr != NULL) {
message_buf = message = (char *)pstr->val;
} else {
- message = Z_STRVAL_PP(argv[2]);
+ message = estrndup(Z_STRVAL_PP(argv[2]), Z_STRLEN_PP(argv[2]));
}
} else {
/* this is not really an error, so it is allowed. */
Index: php4/ext/mbstring/tests/mb_send_mail01.phpt
diff -u php4/ext/mbstring/tests/mb_send_mail01.phpt:1.2
php4/ext/mbstring/tests/mb_send_mail01.phpt:1.3
--- php4/ext/mbstring/tests/mb_send_mail01.phpt:1.2 Thu Nov 21 13:12:53 2002
+++ php4/ext/mbstring/tests/mb_send_mail01.phpt Fri Jan 31 09:15:49 2003
@@ -28,11 +28,11 @@
Content-Type: text/plain; charset=%s
Content-Transfer-Encoding: %s
-test
+dGVzdA==
To: [EMAIL PROTECTED]
Subject: test neutral
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: BASE64
-test
+dGVzdA==
Index: php4/ext/mbstring/tests/mb_send_mail02.phpt
diff -u php4/ext/mbstring/tests/mb_send_mail02.phpt:1.2
php4/ext/mbstring/tests/mb_send_mail02.phpt:1.3
--- php4/ext/mbstring/tests/mb_send_mail02.phpt:1.2 Wed Nov 13 03:27:17 2002
+++ php4/ext/mbstring/tests/mb_send_mail02.phpt Fri Jan 31 09:15:49 2003
@@ -28,7 +28,7 @@
Content-Type: text/plain; charset=%s
Content-Transfer-Encoding: %s
-test
+dGVzdA==
To: [EMAIL PROTECTED]
Subject: =?ISO-2022-JP?B?GyRCJUYlOSVIGyhCIEphcGFuZXNl?=
Mime-Version: 1.0
Index: php4/ext/mbstring/tests/mb_send_mail03.phpt
diff -u php4/ext/mbstring/tests/mb_send_mail03.phpt:1.3
php4/ext/mbstring/tests/mb_send_mail03.phpt:1.4
--- php4/ext/mbstring/tests/mb_send_mail03.phpt:1.3 Thu Nov 21 13:12:53 2002
+++ php4/ext/mbstring/tests/mb_send_mail03.phpt Fri Jan 31 09:15:49 2003
@@ -1,38 +1,38 @@
---TEST--
-mb_send_mail() test 3 (lang=English)
---SKIPIF--
-
---INI--
-sendmail_path=cat
---FILE--
-
---EXPECTF--
-To: [EMAIL PROTECTED]
-Subject: %s
-Mime-Version: 1.0
-Content-Type: text/plain; charset=%s
-Content-Transfer-Encoding: %s
-
-test
-To: [EMAIL PROTECTED]
-Subject: test English
-Mime-Version: 1.0
[PHP-CVS] cvs: CVSROOT / loginfo
imajes Fri Jan 31 08:38:45 2003 EDT
Modified files:
/CVSROOTloginfo
Log:
updating for embed
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.84 CVSROOT/loginfo:1.85
--- CVSROOT/loginfo:1.84Mon Dec 30 21:19:05 2002
+++ CVSROOT/loginfo Fri Jan 31 08:38:44 2003
@@ -1,5 +1,5 @@
#
-#ident "@(#)cvs/examples:$Name: $:$Id: loginfo,v 1.84 2002/12/31 02:19:05 imajes Exp
$"
+#ident "@(#)cvs/examples:$Name: $:$Id: loginfo,v 1.85 2003/01/31 13:38:44 imajes Exp
+$"
#
# The "loginfo" file is used to control where "cvs commit" log information
# is sent. The first entry on a line is a regular expression which is tested
@@ -89,12 +89,10 @@
# misc stuff
^jpgraph $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
-^phpnet-tools $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
^systems $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
^php-lang $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
-^php-bugs-web $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
-
-^adt $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^embed $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^adt $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
# Smarty stuff
^smarty-web$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /ext ext_skel.php
Why don't you call it that then? ext_skel_win32.php or something..? On Fri, 31 Jan 2003, Frank M. Kromann wrote: >fmkThu Jan 30 20:01:53 2003 EDT > > Added files: (Branch: PHP_4_3) >/php4/ext ext_skel.php > Log: > Wrapper script to execute ext_skel on WIn32 > > >Index: php4/ext/ext_skel.php >+++ php4/ext/ext_skel.php > > > > -- <- For Sale! -> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
