- Add sessions module to standard win32 build.

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index f9312062a04503e943f5a17d89436a034268847c..df72b65feac937a8ec5bbb7c11c80e51dc65ee25 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -49,6 +49,7 @@
 #include "ext/standard/reg.h"
 #include "ext/pcre/php_pcre.h"
 #include "ext/odbc/php3_odbc.h"
+#include "ext/session/php_session.h"
 
 /* SNMP has to be moved to ext */
 /* #include "dl/snmp/php3_snmp.h" */
@@ -78,7 +79,8 @@ zend_module_entry *php3_builtin_modules[] = {
        phpext_regex_ptr,
        phpext_pcre_ptr,
        phpext_odbc_ptr,
-       phpext_lcg_ptr
+       phpext_lcg_ptr,
+       phpext_session_ptr
 };
 
        

diff --git a/main/main.c b/main/main.c
index 77b0d160a57ea5457d867ce29262d7febb0dd66e..3cc34ddb127ff15ed9acbd068ebf82682f941536 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -643,7 +643,7 @@ static void php_message_handler_for_zend(long message, void *data)
                                time(&curtime);
                                ta = localtime(&curtime);
                                datetime_str = asctime(ta);
-                               datetime_str[strlen(datetime_str)-1]=0; /* get rid of the traililng newline */
+                               datetime_str[strlen(datetime_str)-1]=0; /* get rid of the trailing newline */
                                fprintf(stderr, "[%s]  Script:  '%s'\n", datetime_str, SAFE_FILENAME(SG(request_info).path_translated));
                        }
                        break;

diff --git a/php4dllts.dsp b/php4dllts.dsp
index 9392ac14387f921d149ed08b44a0a55e0496ab9c..c53cad3249a52aa429f85a3eb02ffe390658542b 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -331,7 +331,7 @@ SOURCE=.\ext\standard\iptc.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\ext\lcg\lcg.c\r
+SOURCE=.\ext\standard\lcg.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -523,15 +523,11 @@ SOURCE=.\ext\standard\php3_string.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\functions\php3_string.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\functions\php3_syslog.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\ext\lcg\php_lcg.h\r
+SOURCE=.\ext\standard\php_lcg.h\r
 # End Source File\r
 # Begin Source File\r
 \r