From: Pierre Joye <pajoye@php.net>
Date: Tue, 8 Jun 2010 13:46:19 +0000 (+0000)
Subject: - [DOC] add session.entropy* support to windows
X-Git-Tag: php-5.3.3RC1~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8b17007e08eb6903399bd282988593d7dc9fb6f;p=php

- [DOC] add session.entropy* support to windows
---

diff --git a/ext/session/tests/020.phpt b/ext/session/tests/020.phpt
index 82997a8f04..53a546f180 100644
--- a/ext/session/tests/020.phpt
+++ b/ext/session/tests/020.phpt
@@ -6,7 +6,7 @@ rewriter uses arg_seperator.output for modifying URLs
 session.use_cookies=0
 session.cache_limiter=
 session.use_trans_sid=1
-arg_separator.output="&amp;"
+arg_separator.output=&
 session.name=PHPSESSID
 session.serialize_handler=php
 session.save_handler=files
diff --git a/php.ini-development b/php.ini-development
index 5da1206dc8..d0a821cf39 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1586,6 +1586,9 @@ session.entropy_length = 0
 
 ; Specified here to create the session id.
 ; http://php.net/session.entropy-file
+; On systems that don't have /dev/urandom /dev/arandom can be used
+; On windows, setting the entropy_length setting will activate the 
+; Windows random source (using the CryptoAPI)
 ;session.entropy_file = /dev/urandom
 session.entropy_file =
 
diff --git a/php.ini-production b/php.ini-production
index 71288e0b1b..1fe2725e8d 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -1594,8 +1594,10 @@ session.entropy_length = 0
 
 ; Specified here to create the session id.
 ; http://php.net/session.entropy-file
+; On systems that don't have /dev/urandom /dev/arandom can be used
+; On windows, setting the entropy_length setting will activate the 
+; Windows random source (using the CryptoAPI)
 ;session.entropy_file = /dev/urandom
-session.entropy_file =
 
 ; http://php.net/session.entropy-length
 ;session.entropy_length = 16