com php-src: fix end of stream exception when generating makefile: win32/build/confutils.js
| From: | Anatol Belski | Date: | Thu, 10 Jul 2014 20:33:55 +0000 |
| Subject: | com php-src: fix end of stream exception when generating makefile: win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79407@lists.php.net to get a copy of this message | ||
Commit: 02b661ecfcc6ddfbeb75b8226690eac5786d6189
Author: Anatol Belski <ab@php.net> Thu, 10 Jul 2014 22:33:55 +0200
Parents: 1f90dd3359df540842ba29d0b3eb087195669b36
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=02b661ecfcc6ddfbeb75b8226690eac5786d6189
Log:
fix end of stream exception when generating makefile
Changed paths:
M win32/build/confutils.js
Diff:
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index ce844dc..05eaa85 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1806,7 +1806,9 @@ function generate_makefile()
MFO.Close();
TF = FSO.OpenTextFile("Makefile.objects", 1);
- MF.Write(TF.ReadAll());
+ if (!TF.AtEndOfStream) {
+ MF.Write(TF.ReadAll());
+ }
TF.Close();
MF.Close();