cvs: php4(PHP_4_0_7) /ext/ircg ircg.c /ext/openssl openssl.c /ext/session php_session.h session.c /ext/standard array.c php_var.h string.c var.c
/ext/wddx wddx.c /sapi/apache2filter apache_config.c
| From: | Zeev Suraski | Date: | Tue, 21 Aug 2001 18:14:38 +0000 |
| Subject: | cvs: php4(PHP_4_0_7) /ext/ircg ircg.c /ext/openssl openssl.c /ext/session php_session.h session.c /ext/standard array.c php_var.h string.c var.c /ext/wddx wddx.c /sapi/apache2filter apache_config.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6998@lists.php.net to get a copy of this message | ||
zeev Tue Aug 21 14:14:38 2001 EDT
Modified files: (Branch: PHP_4_0_7)
/php4/ext/ircg ircg.c
/php4/ext/openssl openssl.c
/php4/ext/session php_session.h session.c
/php4/ext/standard array.c php_var.h string.c var.c
/php4/ext/wddx wddx.c
/php4/sapi/apache2filter apache_config.c
Log:
MFH
Index: php4/ext/ircg/ircg.c diff -u php4/ext/ircg/ircg.c:1.104.2.1 php4/ext/ircg/ircg.c:1.104.2.2 --- php4/ext/ircg/ircg.c:1.104.2.1 Fri Aug 17 09:43:22 2001 +++ php4/ext/ircg/ircg.c Tue Aug 21 14:14:34 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ircg.c,v 1.104.2.1 2001/08/17 13:43:22 sas Exp $ */ +/* $Id: ircg.c,v 1.104.2.2 2001/08/21 18:14:34 zeev Exp $ */ #include <time.h> @@ -1518,7 +1518,7 @@ zval **val; char *str; ulong num; - ulong str_len; + uint str_len; HashPosition pos; format_msg_t fmt; Index: php4/ext/openssl/openssl.c diff -u php4/ext/openssl/openssl.c:1.23 php4/ext/openssl/openssl.c:1.23.2.1 --- php4/ext/openssl/openssl.c:1.23 Tue Jul 31 19:47:32 2001 +++ php4/ext/openssl/openssl.c Tue Aug 21 14:14:34 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.23 2001/07/31 23:47:32 sniper Exp $ */ +/* $Id: openssl.c,v 1.23.2.1 2001/08/21 18:14:34 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1284,7 +1284,8 @@ X509 * cert; int argc; EVP_CIPHER *cipher = NULL; - ulong strindexlen, intindex; + uint strindexlen; + ulong intindex; char * strindex; argc = ZEND_NUM_ARGS(); @@ -1419,7 +1420,8 @@ BIO * infile = NULL, * outfile = NULL; STACK_OF(X509) *others = NULL; long certresource = -1, keyresource = -1; - ulong strindexlen, intindex; + ulong intindex; + uint strindexlen; HashPosition hpos; char * strindex; Index: php4/ext/session/php_session.h diff -u php4/ext/session/php_session.h:1.50 php4/ext/session/php_session.h:1.50.2.1 --- php4/ext/session/php_session.h:1.50 Sun Aug 5 11:55:41 2001 +++ php4/ext/session/php_session.h Tue Aug 21 14:14:34 2001 @@ -174,7 +174,7 @@ #define PS_ENCODE_VARS \ char *key; \ - ulong key_length; \ + uint key_length; \ ulong num_key; \ zval **struc; Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.237 php4/ext/session/session.c:1.237.2.1 --- php4/ext/session/session.c:1.237 Mon Aug 13 03:55:36 2001 +++ php4/ext/session/session.c Tue Aug 21 14:14:34 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.237 2001/08/13 07:55:36 rasmus Exp $ */ +/* $Id: session.c,v 1.237.2.1 2001/08/21 18:14:34 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -529,7 +529,7 @@ int vallen; int ret = FAILURE; char *variable; - ulong variable_len; + uint variable_len; ulong num_key; HashPosition pos; Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.123 php4/ext/standard/array.c:1.123.2.1 --- php4/ext/standard/array.c:1.123 Sat Aug 11 13:03:36 2001 +++ php4/ext/standard/array.c Tue Aug 21 14:14:35 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.123 2001/08/11 17:03:36 zeev Exp $ */ +/* $Id: array.c,v 1.123.2.1 2001/08/21 18:14:35 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -948,7 +948,7 @@ *retval_ptr, /* Return value - unused */ *key; /* Entry key */ char *string_key; - ulong string_key_len; + uint string_key_len; ulong num_key; HashPosition pos; @@ -1144,7 +1144,8 @@ zval **var_array, **z_extract_type, **prefix; zval **entry, *data; char *var_name, *final_name; - ulong num_key, var_name_len; + ulong num_key; + uint var_name_len; int var_exists, extract_type, key_type, count = 0; HashPosition pos; @@ -1735,7 +1736,7 @@ argc; /* Number of function arguments */ char *string_key; - ulong string_key_len; + uint string_key_len; ulong num_key; HashPosition hpos; @@ -1821,7 +1822,7 @@ zval **src_entry, **dest_entry; char *string_key; - ulong string_key_len; + uint string_key_len; ulong num_key; HashPosition pos; @@ -1913,7 +1914,7 @@ *new_val; /* New value */ int add_key; /* Flag to indicate whether a key should be added */ char *string_key; /* String key */ - ulong string_key_len; + uint string_key_len; ulong num_key; /* Numeric key */ HashPosition pos; @@ -2074,7 +2075,7 @@ **z_preserve_keys, /* Flag: whether to preserve keys */ **entry; /* An entry in the input array */ char *string_key; - ulong string_key_len; + uint string_key_len; ulong num_key; zend_bool preserve_keys = 0; HashPosition pos; @@ -2195,7 +2196,7 @@ zval **array, **entry, *data; HashTable *target_hash; char *string_key; - ulong str_key_len; + uint str_key_len; ulong num_key; HashPosition pos; @@ -2721,7 +2722,7 @@ long randval; int num_req_val, num_avail, key_type; char *string_key; - ulong string_key_len; + uint string_key_len; ulong num_key; HashPosition pos; @@ -2926,7 +2927,7 @@ zval *retval = NULL; char *callback_name; char *string_key; - ulong string_key_len; + uint string_key_len; ulong num_key; HashPosition pos; Index: php4/ext/standard/php_var.h diff -u php4/ext/standard/php_var.h:1.13 php4/ext/standard/php_var.h:1.13.2.1 --- php4/ext/standard/php_var.h:1.13 Sat Aug 11 13:03:37 2001 +++ php4/ext/standard/php_var.h Tue Aug 21 14:14:35 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_var.h,v 1.13 2001/08/11 17:03:37 zeev Exp $ */ +/* $Id: php_var.h,v 1.13.2.1 2001/08/21 18:14:35 zeev Exp $ */ #ifndef PHP_VAR_H #define PHP_VAR_H @@ -53,8 +53,9 @@ while (zend_hash_get_current_data_ex(var_hash, (void **) &zval_ref, &pos) == SUCCESS) { \ if (*zval_ref == ozval) { \ char *string_key; \ - ulong str_key_len; \ + uint str_key_len; \ ulong num_key; \ + \ zend_hash_get_current_key_ex(var_hash, &string_key, &str_key_len, &num_key, 1, &pos); \ /* this is our hash and it _will_ be number indexed! */ \ zend_hash_index_update(var_hash, num_key, &nzval, sizeof(zval *), NULL); \ Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.224 php4/ext/standard/string.c:1.224.2.1 --- php4/ext/standard/string.c:1.224 Sat Aug 11 13:03:37 2001 +++ php4/ext/standard/string.c Tue Aug 21 14:14:36 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.224 2001/08/11 17:03:37 zeev Exp $ */ +/* $Id: string.c,v 1.224.2.1 2001/08/21 18:14:36 zeev Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -2713,7 +2713,8 @@ zval **subject, **search, **replace, **subject_entry, **pboyer; zval *result; char *string_key; - ulong string_key_len, num_key; + uint string_key_len; + ulong num_key; int boyer = 0; if(ZEND_NUM_ARGS() < 3 || Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.113 php4/ext/standard/var.c:1.113.2.1 --- php4/ext/standard/var.c:1.113 Tue Aug 14 13:43:39 2001 +++ php4/ext/standard/var.c Tue Aug 21 14:14:37 2001 @@ -322,7 +322,7 @@ char *key; zval **data; ulong index; - ulong key_len; + uint key_len; HashPosition pos; zend_hash_internal_pointer_reset_ex(myht, &pos); Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.79 php4/ext/wddx/wddx.c:1.79.2.1 --- php4/ext/wddx/wddx.c:1.79 Tue Aug 14 16:38:56 2001 +++ php4/ext/wddx/wddx.c Tue Aug 21 14:14:37 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.79 2001/08/14 20:38:56 andrei Exp $ */ +/* $Id: wddx.c,v 1.79.2.1 2001/08/21 18:14:37 zeev Exp $ */ #include "php.h" #include "php_wddx.h" @@ -246,7 +246,7 @@ zval *retval; zval **ent; char *key; - ulong key_length; + uint key_length; char tmp[128]; ulong idx; int hash_type; @@ -477,7 +477,7 @@ php_wddx_add_chunk_static(packet, WDDX_STRUCT_E); } } else { - ulong key_len; + uint key_len; PHP_CLASS_ATTRIBUTES; @@ -524,7 +524,7 @@ { zval **ent; char *key; - ulong key_len; + uint key_len; int is_struct = 0, ent_type; ulong idx; HashTable *target_hash; Index: php4/sapi/apache2filter/apache_config.c diff -u php4/sapi/apache2filter/apache_config.c:1.11 php4/sapi/apache2filter/apache_config.c:1.11.6.1 --- php4/sapi/apache2filter/apache_config.c:1.11 Wed Feb 28 09:11:34 2001 +++ php4/sapi/apache2filter/apache_config.c Tue Aug 21 14:14:38 2001 @@ -88,7 +88,7 @@ php_dir_entry *pe; php_dir_entry *data; char *str; - ulong str_len; + uint str_len; ulong num_index; phpapdebug((stderr, "Merge dir (%p) (%p)\n", base_conf, new_conf)); @@ -110,7 +110,7 @@ { php_conf_rec *d = dummy; char *str; - ulong str_len; + uint str_len; php_dir_entry *data; for (zend_hash_internal_pointer_reset(&d->config);
Index: php4/ext/ircg/ircg.c diff -u php4/ext/ircg/ircg.c:1.104.2.1 php4/ext/ircg/ircg.c:1.104.2.2 --- php4/ext/ircg/ircg.c:1.104.2.1 Fri Aug 17 09:43:22 2001 +++ php4/ext/ircg/ircg.c Tue Aug 21 14:14:34 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ircg.c,v 1.104.2.1 2001/08/17 13:43:22 sas Exp $ */ +/* $Id: ircg.c,v 1.104.2.2 2001/08/21 18:14:34 zeev Exp $ */ #include <time.h> @@ -1518,7 +1518,7 @@ zval **val; char *str; ulong num; - ulong str_len; + uint str_len; HashPosition pos; format_msg_t fmt; Index: php4/ext/openssl/openssl.c diff -u php4/ext/openssl/openssl.c:1.23 php4/ext/openssl/openssl.c:1.23.2.1 --- php4/ext/openssl/openssl.c:1.23 Tue Jul 31 19:47:32 2001 +++ php4/ext/openssl/openssl.c Tue Aug 21 14:14:34 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.23 2001/07/31 23:47:32 sniper Exp $ */ +/* $Id: openssl.c,v 1.23.2.1 2001/08/21 18:14:34 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1284,7 +1284,8 @@ X509 * cert; int argc; EVP_CIPHER *cipher = NULL; - ulong strindexlen, intindex; + uint strindexlen; + ulong intindex; char * strindex; argc = ZEND_NUM_ARGS(); @@ -1419,7 +1420,8 @@ BIO * infile = NULL, * outfile = NULL; STACK_OF(X509) *others = NULL; long certresource = -1, keyresource = -1; - ulong strindexlen, intindex; + ulong intindex; + uint strindexlen; HashPosition hpos; char * strindex; Index: php4/ext/session/php_session.h diff -u php4/ext/session/php_session.h:1.50 php4/ext/session/php_session.h:1.50.2.1 --- php4/ext/session/php_session.h:1.50 Sun Aug 5 11:55:41 2001 +++ php4/ext/session/php_session.h Tue Aug 21 14:14:34 2001 @@ -174,7 +174,7 @@ #define PS_ENCODE_VARS \ char *key; \ - ulong key_length; \ + uint key_length; \ ulong num_key; \ zval **struc; Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.237 php4/ext/session/session.c:1.237.2.1 --- php4/ext/session/session.c:1.237 Mon Aug 13 03:55:36 2001 +++ php4/ext/session/session.c Tue Aug 21 14:14:34 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.237 2001/08/13 07:55:36 rasmus Exp $ */ +/* $Id: session.c,v 1.237.2.1 2001/08/21 18:14:34 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -529,7 +529,7 @@ int vallen; int ret = FAILURE; char *variable; - ulong variable_len; + uint variable_len; ulong num_key; HashPosition pos; Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.123 php4/ext/standard/array.c:1.123.2.1 --- php4/ext/standard/array.c:1.123 Sat Aug 11 13:03:36 2001 +++ php4/ext/standard/array.c Tue Aug 21 14:14:35 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.123 2001/08/11 17:03:36 zeev Exp $ */ +/* $Id: array.c,v 1.123.2.1 2001/08/21 18:14:35 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -948,7 +948,7 @@ *retval_ptr, /* Return value - unused */ *key; /* Entry key */ char *string_key; - ulong string_key_len; + uint string_key_len; ulong num_key; HashPosition pos; @@ -1144,7 +1144,8 @@ zval **var_array, **z_extract_type, **prefix; zval **entry, *data; char *var_name, *final_name; - ulong num_key, var_name_len; + ulong num_key; + uint var_name_len; int var_exists, extract_type, key_type, count = 0; HashPosition pos; @@ -1735,7 +1736,7 @@ argc; /* Number of function arguments */ char *string_key; - ulong string_key_len; + uint string_key_len; ulong num_key; HashPosition hpos; @@ -1821,7 +1822,7 @@ zval **src_entry, **dest_entry; char *string_key; - ulong string_key_len; + uint string_key_len; ulong num_key; HashPosition pos; @@ -1913,7 +1914,7 @@ *new_val; /* New value */ int add_key; /* Flag to indicate whether a key should be added */ char *string_key; /* String key */ - ulong string_key_len; + uint string_key_len; ulong num_key; /* Numeric key */ HashPosition pos; @@ -2074,7 +2075,7 @@ **z_preserve_keys, /* Flag: whether to preserve keys */ **entry; /* An entry in the input array */ char *string_key; - ulong string_key_len; + uint string_key_len; ulong num_key; zend_bool preserve_keys = 0; HashPosition pos; @@ -2195,7 +2196,7 @@ zval **array, **entry, *data; HashTable *target_hash; char *string_key; - ulong str_key_len; + uint str_key_len; ulong num_key; HashPosition pos; @@ -2721,7 +2722,7 @@ long randval; int num_req_val, num_avail, key_type; char *string_key; - ulong string_key_len; + uint string_key_len; ulong num_key; HashPosition pos; @@ -2926,7 +2927,7 @@ zval *retval = NULL; char *callback_name; char *string_key; - ulong string_key_len; + uint string_key_len; ulong num_key; HashPosition pos; Index: php4/ext/standard/php_var.h diff -u php4/ext/standard/php_var.h:1.13 php4/ext/standard/php_var.h:1.13.2.1 --- php4/ext/standard/php_var.h:1.13 Sat Aug 11 13:03:37 2001 +++ php4/ext/standard/php_var.h Tue Aug 21 14:14:35 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_var.h,v 1.13 2001/08/11 17:03:37 zeev Exp $ */ +/* $Id: php_var.h,v 1.13.2.1 2001/08/21 18:14:35 zeev Exp $ */ #ifndef PHP_VAR_H #define PHP_VAR_H @@ -53,8 +53,9 @@ while (zend_hash_get_current_data_ex(var_hash, (void **) &zval_ref, &pos) == SUCCESS) { \ if (*zval_ref == ozval) { \ char *string_key; \ - ulong str_key_len; \ + uint str_key_len; \ ulong num_key; \ + \ zend_hash_get_current_key_ex(var_hash, &string_key, &str_key_len, &num_key, 1, &pos); \ /* this is our hash and it _will_ be number indexed! */ \ zend_hash_index_update(var_hash, num_key, &nzval, sizeof(zval *), NULL); \ Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.224 php4/ext/standard/string.c:1.224.2.1 --- php4/ext/standard/string.c:1.224 Sat Aug 11 13:03:37 2001 +++ php4/ext/standard/string.c Tue Aug 21 14:14:36 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.224 2001/08/11 17:03:37 zeev Exp $ */ +/* $Id: string.c,v 1.224.2.1 2001/08/21 18:14:36 zeev Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -2713,7 +2713,8 @@ zval **subject, **search, **replace, **subject_entry, **pboyer; zval *result; char *string_key; - ulong string_key_len, num_key; + uint string_key_len; + ulong num_key; int boyer = 0; if(ZEND_NUM_ARGS() < 3 || Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.113 php4/ext/standard/var.c:1.113.2.1 --- php4/ext/standard/var.c:1.113 Tue Aug 14 13:43:39 2001 +++ php4/ext/standard/var.c Tue Aug 21 14:14:37 2001 @@ -322,7 +322,7 @@ char *key; zval **data; ulong index; - ulong key_len; + uint key_len; HashPosition pos; zend_hash_internal_pointer_reset_ex(myht, &pos); Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.79 php4/ext/wddx/wddx.c:1.79.2.1 --- php4/ext/wddx/wddx.c:1.79 Tue Aug 14 16:38:56 2001 +++ php4/ext/wddx/wddx.c Tue Aug 21 14:14:37 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.79 2001/08/14 20:38:56 andrei Exp $ */ +/* $Id: wddx.c,v 1.79.2.1 2001/08/21 18:14:37 zeev Exp $ */ #include "php.h" #include "php_wddx.h" @@ -246,7 +246,7 @@ zval *retval; zval **ent; char *key; - ulong key_length; + uint key_length; char tmp[128]; ulong idx; int hash_type; @@ -477,7 +477,7 @@ php_wddx_add_chunk_static(packet, WDDX_STRUCT_E); } } else { - ulong key_len; + uint key_len; PHP_CLASS_ATTRIBUTES; @@ -524,7 +524,7 @@ { zval **ent; char *key; - ulong key_len; + uint key_len; int is_struct = 0, ent_type; ulong idx; HashTable *target_hash; Index: php4/sapi/apache2filter/apache_config.c diff -u php4/sapi/apache2filter/apache_config.c:1.11 php4/sapi/apache2filter/apache_config.c:1.11.6.1 --- php4/sapi/apache2filter/apache_config.c:1.11 Wed Feb 28 09:11:34 2001 +++ php4/sapi/apache2filter/apache_config.c Tue Aug 21 14:14:38 2001 @@ -88,7 +88,7 @@ php_dir_entry *pe; php_dir_entry *data; char *str; - ulong str_len; + uint str_len; ulong num_index; phpapdebug((stderr, "Merge dir (%p) (%p)\n", base_conf, new_conf)); @@ -110,7 +110,7 @@ { php_conf_rec *d = dummy; char *str; - ulong str_len; + uint str_len; php_dir_entry *data; for (zend_hash_internal_pointer_reset(&d->config);