sniper Wed Feb 25 18:38:04 2004 EDT
Modified files:
/php-src/win32/build mkdist.php
Log:
- Fixed bug #27368 (php.ini-* has lone CR in the end)
# regex taken from win32/sendmail.c (suggested by Sara)
# And Andrei invited Wez to his speech on the cruise.. :)
http://cvs.php.net/diff.php/php-src/win32/build/mkdist.php?r1=1.8&r2=1.9&ty=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.8 php-src/win32/build/mkdist.php:1.9
--- php-src/win32/build/mkdist.php:1.8 Thu Feb 12 12:58:52 2004
+++ php-src/win32/build/mkdist.php Wed Feb 25 18:38:03 2004
@@ -1,4 +1,4 @@
-<?php # $Id: mkdist.php,v 1.8 2004/02/12 17:58:52 wez Exp $
+<?php # $Id: mkdist.php,v 1.9 2004/02/25 23:38:03 sniper Exp $
/* piece together a windows binary distro */
$build_dir = $argv[1];
@@ -128,7 +128,7 @@
function copy_text_file($source, $dest)
{
$text = file_get_contents($source);
- $text = preg_replace("/[^\r]\n$/", "\r\n", $text);
+ $text = preg_replace("/(\r\n?)|\n/", "\r\n", $text);
$fp = fopen($dest, "w");
fwrite($fp, $text);
fclose($fp);
@@ -161,6 +161,7 @@
"NEWS" => "news.txt",
"php.ini-dist" => "php.ini-dist",
"php.ini-recommended" => "php.ini-recommended",
+ "win32/install.txt" => "install.txt",
);
foreach ($text_files as $src => $dest) {
@@ -169,7 +170,6 @@
/* general other files */
$general_files = array(
- "win32/install.txt" => "install.txt",
"php.gif" => "php.gif",
);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
