crypt constants

diff --git a/ChangeLog.TODO b/ChangeLog.TODO
index e503630983c7ef658117ea6fa76483c84415a9ae..a76d834d6f43cdf9286a0ac6820a59d62b4d830a 100644 (file)
--- 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 df3e48c50b0d7d435936078e28cd49acfc3dbdc6..0bd00625a43bfa24a76cc071372c1d2a35e3a43f 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -425,6 +425,9 @@ static void _php3_closesocket(int *sock) {
                closesocket(socketd);
 #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 eea721f5ddbd6ddb6265986cf127747fdbad23cd..04c2f79f95c4a1ffb9666236339a3abc226c1298 100644 (file)
--- 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 6048ada3f8984b31db2de0498031ec7a9df1ce0c..03c99ea7b10adaa6859dabf12f07b3f869c40687 100644 (file)
--- 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"