CVS update: php31/ext/standard

Date: Tuesday August 11, 1998 @ 14:22 Author: shane Update of /repository/php31/ext/standard In directory asf:/tmp/cvs-serv2616/ext/standard Modified Files: md5.c Log Message: add aborting code to cgi and isapi. remove apache code from md5. Index: php31/ext/standard/md5.c diff -c php31/ext/standard/md5.c:2.1 php31/ext/standard/md5.c:2.2 *** php31/ext/standard/md5.c:2.1 Tue Aug 11 11:08:11 1998 --- php31/ext/standard/md5.c Tue Aug 11 14:22:36 1998 *************** *** 39,76 **** #include "php.h" #include "internal_functions.h" - #if APACHE - #include "php3_apache.h" - #include <util_md5.h> - #else #include "md5.h" - #endif void php3_md5(INTERNAL_FUNCTION_PARAMETERS) { pval *arg; char md5str[33]; - #if (!APACHE) PHP3_MD5_CTX context; unsigned int len; unsigned char digest[16]; int i; char *r; - #endif - TLS_VARS; if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string(arg); - #if APACHE - #if MODULE_MAGIC_NUMBER > 19970901 - strcpy(md5str, ap_md5(GLOBAL(php3_rqst)->pool, arg->value.str.val)); - #else - strcpy(md5str, md5(GLOBAL(php3_rqst)->pool, arg->value.str.val)); - #endif - #else len = strlen(arg->value.str.val); md5str[0] = '\0'; PHP3_MD5Init(&context); --- 39,61 ---- *************** *** 80,90 **** sprintf(r, "%02x", digest[i]); } *r = '\0'; ! #endif RETVAL_STRING(md5str,1); } - #if (!APACHE) /* * The remaining code is the reference MD5 code (md5c.c) from rfc1321 */ --- 65,74 ---- sprintf(r, "%02x", digest[i]); } *r = '\0'; ! RETVAL_STRING(md5str,1); } /* * The remaining code is the reference MD5 code (md5c.c) from rfc1321 */ *************** *** 416,422 **** ((char *) output)[i] = (char) value; } - #endif /* * Local variables: --- 400,405 ---- -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net