diff options
| author | Sascha Schumann <sas@php.net> | 1999-04-21 17:57:40 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-04-21 17:57:40 +0000 |
| commit | f06cb4deb6115b120e8dfcf14ca1dacc83d887fe (patch) | |
| tree | 303e9068e6a72b699fb1eaf08714704005f21a29 | |
| parent | 2873f446f26f3f334500a5892b92b326294ee8c6 (diff) | |
| download | php-git-f06cb4deb6115b120e8dfcf14ca1dacc83d887fe.tar.gz | |
crypt constants
| -rw-r--r-- | ChangeLog.TODO | 2 | ||||
| -rw-r--r-- | ext/standard/file.c | 3 | ||||
| -rw-r--r-- | ext/standard/php3_string.h | 8 | ||||
| -rw-r--r-- | internal_functions.c | 1 |
4 files changed, 4 insertions, 10 deletions
diff --git a/ChangeLog.TODO b/ChangeLog.TODO index e503630983..a76d834d6f 100644 --- a/ChangeLog.TODO +++ b/ChangeLog.TODO @@ -12,7 +12,6 @@ over to PHP4. - fixed some NULL-column related problems in OCI8-module. - optimized fgets() and fread() - memory leak in operators.c fixed -- socket leak fixed (Sascha Schumann) - Fixed the XML bug that caused garbage behind attributes - Some Informix driver improvements. - PUT method support (mlemos@acm.org) @@ -25,7 +24,6 @@ over to PHP4. 'n' - month, numeric, no leading zeros - Make fgetss() slightly smarter - Add strip_tags() which uses the fgetss state-machine but acts on a string -- Add CRYPT_SALT_LENGTH constant March 1 1999, Version 3.0.7 - Added pdf_put_image and pdf_execute_image diff --git a/ext/standard/file.c b/ext/standard/file.c index df3e48c50b..0bd00625a4 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -426,6 +426,9 @@ static void _php3_closesocket(int *sock) { #else close(socketd); #endif +#if HAVE_SHUTDOWN + shutdown(socketd, 0); +#endif efree(sock); } } diff --git a/ext/standard/php3_string.h b/ext/standard/php3_string.h index eea721f5dd..04c2f79f95 100644 --- a/ext/standard/php3_string.h +++ b/ext/standard/php3_string.h @@ -80,14 +80,6 @@ extern void php3_stristr(INTERNAL_FUNCTION_PARAMETERS); extern void php3_chunk_split(INTERNAL_FUNCTION_PARAMETERS); extern void php3_parsestr(INTERNAL_FUNCTION_PARAMETERS); -#if HAVE_CRYPT -extern php3_module_entry crypt_module_entry; -#define crypt_module_ptr &crypt_module_entry -extern void php3_crypt(INTERNAL_FUNCTION_PARAMETERS); -#else -#define crypt_module_ptr NULL -#endif - extern PHPAPI char *_php3_strtoupper(char *s); extern PHPAPI char *_php3_strtolower(char *s); extern char *_StrTr(char *string, char *str_from, char *str_to); diff --git a/internal_functions.c b/internal_functions.c index 6048ada3f8..03c99ea7b1 100644 --- a/internal_functions.c +++ b/internal_functions.c @@ -47,6 +47,7 @@ #include "ext/gettext/php3_gettext.h" #include "functions/php3_ifx.h" +#include "functions/php3_crypt.h" #include "functions/php3_ldap.h" #include "functions/php3_mysql.h" #include "functions/php3_bcmath.h" |