cvs: php4 / NEWS /ext/com COM.c /ext/standard var.c /sapi/cgi cgi_main.c

zeev Sun Jul 15 10:08:58 2001 EDT Modified files: /php4 NEWS /php4/ext/com COM.c /php4/ext/standard var.c /php4/sapi/cgi cgi_main.c Log: Improved interactive mode - it is now available in all builds, without any significant slowdown Index: php4/NEWS diff -u php4/NEWS:1.709 php4/NEWS:1.710 --- php4/NEWS:1.709 Sat Jul 14 19:10:25 2001 +++ php4/NEWS Sun Jul 15 10:08:57 2001 @@ -1,6 +1,8 @@ PHP 4.0 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 200?, Version 4.0.7-dev +?? ??? 200?, Version 4.0.7-dev +- Improved interactive mode - it is now available in all builds of PHP, without + any significant slowdown (Zeev, Zend Engine) - Fixed crash in iptcparse() if the supplied data was bogus. (Thies) - Fix return value for a failed snmpset() - now returns false (Rasmus) - Add hostname:port support to snmp functions @@ -9,8 +11,8 @@ - Fixed return value for a failed snmpset() - now returns false (Rasmus) - Added hostname:port support to snmp functions (nbougues@axialys.net, Rasmus) - Added fdf_set_encoding() function (Masaki YATSU, Rasmus) -- Reversed the destruction-order of resources. This fixes the reported OCI8 - "failed to rollback outstanding transactions!" message. (Thies Zend Engine) +- Reversed the destruction-order of resources. This fixes the reported OCI8 + "failed to rollback outstanding transactions!" message (Thies, Zend Engine) - Added option for returning XMLRPC fault packets. (Matt Allen, Sascha Schumann) - Improved range() function to support range('a','z') and range(9,0) types of Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.29 php4/ext/com/COM.c:1.30 --- php4/ext/com/COM.c:1.29 Wed Jul 11 08:42:21 2001 +++ php4/ext/com/COM.c Sun Jul 15 10:08:58 2001 @@ -351,26 +351,21 @@ FILE *typelib_file; char *typelib_name_buffer; char *strtok_buf = NULL; -#if SUPPORT_INTERACTIVE int interactive; - ELS_FETCH(); - - interactive = EG(interactive); -#endif + CLS_FETCH(); + interactive = CG(interactive); if(!new_value || (typelib_file = VCWD_FOPEN(new_value, "r"))==NULL) { return FAILURE; } -#if SUPPORT_INTERACTIVE if(interactive) { printf("Loading type libraries..."); fflush(stdout); } -#endif typelib_name_buffer = (char *) emalloc(sizeof(char)*1024); @@ -413,12 +408,10 @@ } -#if SUPPORT_INTERACTIVE if(interactive) { printf("\rLoading %-60s\r", typelib_name); } -#endif if((pTL = php_COM_find_typelib(typelib_name, mode)) != NULL) { php_COM_load_typelib(pTL, mode); @@ -429,12 +422,10 @@ efree(typelib_name_buffer); fclose(typelib_file); -#if SUPPORT_INTERACTIVE if(interactive) { printf("\r%70s\r", ""); } -#endif return SUCCESS; } Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.94 php4/ext/standard/var.c:1.95 --- php4/ext/standard/var.c:1.94 Wed Jul 11 07:45:05 2001 +++ php4/ext/standard/var.c Sun Jul 15 10:08:58 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.94 2001/07/11 11:45:05 stas Exp $ */ +/* $Id: var.c,v 1.95 2001/07/15 14:08:58 zeev Exp $ */ /* {{{ includes @@ -154,9 +154,8 @@ /* }}} */ /* {{{ php_var_serialize */ -inline int php_add_var_hash(HashTable *var_hash, zval *var, void *var_old); - -inline int php_add_var_hash(HashTable *var_hash, zval *var, void *var_old) { +static inline int php_add_var_hash(HashTable *var_hash, zval *var, void *var_old) +{ ulong var_no; char id[sizeof(void *)*2+3]; Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.115 php4/sapi/cgi/cgi_main.c:1.116 --- php4/sapi/cgi/cgi_main.c:1.115 Mon Jul 2 14:17:10 2001 +++ php4/sapi/cgi/cgi_main.c Sun Jul 15 10:08:58 2001 @@ -253,9 +253,7 @@ " -v Version number\n" " -C Do not chdir to the script's directory\n" " -c <path> Look for php.ini file in this directory\n" -#if SUPPORT_INTERACTIVE " -a Run interactively\n" -#endif " -d foo[=bar] Define INI entry foo with value 'bar'\n" " -e Generate extended information for debugger/profiler\n" " -z <file> Load Zend extension <file>.\n" @@ -379,9 +377,7 @@ char *argv0=NULL; char *script_file=NULL; zend_llist global_vars; -#if SUPPORT_INTERACTIVE int interactive=0; -#endif /* end of temporary locals */ #ifdef ZTS zend_compiler_globals *compiler_globals; @@ -531,12 +527,8 @@ switch (c) { case 'a': /* interactive mode */ -#if SUPPORT_INTERACTIVE printf("Interactive mode enabled\n\n"); interactive=1; -#else - printf("Interactive mode not supported!\n\n"); -#endif break; case 'C': /* don't chdir to the script directory */ @@ -645,9 +637,7 @@ } } /* not cgi */ -#if SUPPORT_INTERACTIVE - EG(interactive) = interactive; -#endif + CG(interactive) = interactive; if (!cgi) { if (!SG(request_info).query_string) {