date:20080925

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2008-09-25 Thread changelog

changelog   Fri Sep 26 01:32:01 2008 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3179r2=1.3180diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.3179 php-src/ChangeLog:1.3180
--- php-src/ChangeLog:1.3179Thu Sep 25 01:31:47 2008
+++ php-src/ChangeLog   Fri Sep 26 01:32:00 2008
@@ -1,3 +1,16 @@
+2008-09-25  Pierre-Alain Joye  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  win32/build/Makefile
+  win32/build/config.w32
+  win32/build/confutils.js:
+  - MFH: add VC version and architecture to the created zip(s) names
+
+* win32/build/Makefile
+  win32/build/config.w32
+  win32/build/confutils.js:
+  - add VC version and architecture to the created zip(s) names
+
 2008-09-24  Ilia Alshanetsky  [EMAIL PROTECTED]
 
 * (PHP_5_3)
@@ -6586,7 +6599,7 @@
 
 * sapi/litespeed/lsapi_main.c
   sapi/litespeed/lsapilib.c:
-  - Added missing $Id: ChangeLog,v 1.3179 2008/09/25 01:31:47 changelog 
Exp $ tags and nuked c++ comments
+  - Added missing $Id: ChangeLog,v 1.3180 2008/09/26 01:32:00 changelog 
Exp $ tags and nuked c++ comments
 
 * (PHP_5_3)
   ext/intl/locale/locale.c

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build Makefile config.w32 confutils.js

2008-09-25 Thread Pierre-Alain Joye

pajoye  Thu Sep 25 15:01:00 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildMakefile config.w32 confutils.js 
  Log:
  - MFH: add VC version and architecture to the created zip(s) names
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.6.2.6r2=1.35.2.1.2.6.2.7diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.35.2.1.2.6.2.6 
php-src/win32/build/Makefile:1.35.2.1.2.6.2.7
--- php-src/win32/build/Makefile:1.35.2.1.2.6.2.6   Sun Jul 20 02:20:31 2008
+++ php-src/win32/build/MakefileThu Sep 25 15:00:59 2008
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong [EMAIL PROTECTED]   |
 #  +--+
 #
-# $Id: Makefile,v 1.35.2.1.2.6.2.6 2008/07/20 02:20:31 sfox Exp $
+# $Id: Makefile,v 1.35.2.1.2.6.2.7 2008/09/25 15:00:59 pajoye Exp $
 # This is the makefile template for the win32 build
 
 CC=$(CL)
@@ -126,18 +126,18 @@
 build-dist: $(BUILD_DIR)\deplister.exe
-rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-rd /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-   -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
-   -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip
-   -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip
+   -del /f /q 
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)..zip
+   -del /f /q 
$(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)..zip
+   -del /f /q 
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)..zip
$(BUILD_DIR)\php.exe -n win32/build/mkdist.php $(BUILD_DIR) 
$(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES) 
$(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES) $(SNAPSHOT_TEMPLATE)
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-   -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)-Win32.zip .
+   -$(ZIP) -9 -r 
..\php-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
 .
cd ..\..
cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-   -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)-Win32.zip .
+   -$(ZIP) -9 -r 
..\pecl-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
 .
cd ..\..
cd $(BUILD_DIR)
-   -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip *.pdb
+   -$(ZIP) -9 
php-debug-pack-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
 *.pdb
cd ..\..
 
 dist: all build-dist
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.31r2=1.40.2.8.2.10.2.32diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.31 
php-src/win32/build/config.w32:1.40.2.8.2.10.2.32
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.31   Sat Aug 23 19:22:10 2008
+++ php-src/win32/build/config.w32  Thu Sep 25 15:00:59 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.31 2008/08/23 19:22:10 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.32 2008/09/25 15:00:59 pajoye Exp $
 // Master config file; think of it as a configure.in
 // equivalent.
 
@@ -19,6 +19,7 @@
 VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
 STDOUT.WriteLine(  Detected compiler  + VC_VERSIONS[VCVERS]);
 AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], Detected compiler version);
+DEFINE(PHP_COMPILER_SHORT, VC_VERSIONS_SHORT[VCVERS]);
 
 // do we use x64 or 80x86 version of compiler?
 X64 = probe_binary(CL, 64);
@@ -28,6 +29,7 @@
STDOUT.WriteLine(  Detected 32-bit compiler);
 }
 AC_DEFINE('ARCHITECTURE', X64 ? 'x64' : 'x86', Detected compiler 
architecture);
+DEFINE(PHP_ARCHITECTURE, X64 ? 'x64' : 'x86');
 
 // cygwin now ships with link.exe.  Avoid searching the cygwin path
 // for this, as we want the MS linker, not the fileutil
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.29r2=1.60.2.1.2.8.2.30diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.29 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.30
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.29  Fri Jul 25 12:40:45 2008
+++ php-src/win32/build/confutils.jsThu Sep 25 15:00:59 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.29 2008/07/25 12:40:45 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.30 2008/09/25 15:00:59 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -42,6 +42,13 @@
 VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
 VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
 
+var VC_VERSIONS_SHORT = new Array();
+VC_VERSIONS_SHORT[1200] = 'VC6';
+VC_VERSIONS_SHORT[1300] = 'VC7';
+VC_VERSIONS_SHORT[1310] =

[PHP-CVS] cvs: php-src /win32/build Makefile config.w32 confutils.js

2008-09-25 Thread Pierre-Alain Joye

pajoye  Thu Sep 25 14:59:10 2008 UTC

  Modified files:  
/php-src/win32/buildMakefile config.w32 confutils.js 
  Log:
  - add VC version and architecture to the created zip(s) names
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.48r2=1.49diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.48 php-src/win32/build/Makefile:1.49
--- php-src/win32/build/Makefile:1.48   Mon Jul 21 09:56:37 2008
+++ php-src/win32/build/MakefileThu Sep 25 14:59:10 2008
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong [EMAIL PROTECTED]   |
 #  +--+
 #
-# $Id: Makefile,v 1.48 2008/07/21 09:56:37 sfox Exp $
+# $Id: Makefile,v 1.49 2008/09/25 14:59:10 pajoye Exp $
 # This is the makefile template for the win32 build
 
 CC=$(CL)
@@ -126,18 +126,18 @@
 build-dist: $(BUILD_DIR)\deplister.exe
-rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-rd /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-   -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
-   -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip
-   -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip
+   -del /f /q 
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
+   -del /f /q 
$(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
+   -del /f /q 
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
$(BUILD_DIR)\php.exe -n win32/build/mkdist.php $(BUILD_DIR) 
$(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES) 
$(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES) $(SNAPSHOT_TEMPLATE)
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-   -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)-Win32.zip .
+   -$(ZIP) -9 -r 
..\php-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
 .
cd ..\..
cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-   -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)-Win32.zip .
+   -$(ZIP) -9 -r 
..\pecl-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
 .
cd ..\..
cd $(BUILD_DIR)
-   -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip *.pdb
+   -$(ZIP) -9 
php-debug-pack-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
 *.pdb
cd ..\..
 
 dist: all build-dist
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.85r2=1.86diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.85 php-src/win32/build/config.w32:1.86
--- php-src/win32/build/config.w32:1.85 Sat Aug 23 19:50:36 2008
+++ php-src/win32/build/config.w32  Thu Sep 25 14:59:10 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.85 2008/08/23 19:50:36 pajoye Exp $
+// $Id: config.w32,v 1.86 2008/09/25 14:59:10 pajoye Exp $
 // Master config file; think of it as a configure.in
 // equivalent.
 
@@ -19,6 +19,7 @@
 VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
 STDOUT.WriteLine(  Detected compiler  + VC_VERSIONS[VCVERS]);
 AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], Detected compiler version);
+DEFINE(PHP_COMPILER_SHORT, VC_VERSIONS_SHORT[VCVERS]);
 
 // do we use x64 or 80x86 version of compiler?
 X64 = probe_binary(CL, 64);
@@ -28,6 +29,7 @@
STDOUT.WriteLine(  Detected 32-bit compiler);
 }
 AC_DEFINE('ARCHITECTURE', X64 ? 'x64' : 'x86', Detected compiler 
architecture);
+DEFINE(PHP_ARCHITECTURE, X64 ? 'x64' : 'x86');
 
 // cygwin now ships with link.exe.  Avoid searching the cygwin path
 // for this, as we want the MS linker, not the fileutil
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.79r2=1.80diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.79 
php-src/win32/build/confutils.js:1.80
--- php-src/win32/build/confutils.js:1.79   Fri Jul 25 12:40:13 2008
+++ php-src/win32/build/confutils.jsThu Sep 25 14:59:10 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.79 2008/07/25 12:40:13 pajoye Exp $
+// $Id: confutils.js,v 1.80 2008/09/25 14:59:10 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -42,6 +42,13 @@
 VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
 VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
 
+var VC_VERSIONS_SHORT = new Array();
+VC_VERSIONS_SHORT[1200] = 'VC6';
+VC_VERSIONS_SHORT[1300] = 'VC7';
+VC_VERSIONS_SHORT[1310] = 'VC7.1';
+VC_VERSIONS_SHORT[1400] = 'VC8';
+VC_VERSIONS_SHORT[1500] = 'VC9';
+
 if (PROGRAM_FILES == null) {
PROGRAM_FILES = C:\\Program Files;
 }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar func_interceptors.c

2008-09-25 Thread Greg Beaver

cellog  Fri Sep 26 04:41:22 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   func_interceptors.c 
  Log:
  fix obvious memory leak
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/func_interceptors.c?r1=1.20.2.18r2=1.20.2.19diff_format=u
Index: php-src/ext/phar/func_interceptors.c
diff -u php-src/ext/phar/func_interceptors.c:1.20.2.18 
php-src/ext/phar/func_interceptors.c:1.20.2.19
--- php-src/ext/phar/func_interceptors.c:1.20.2.18  Sat Sep 13 22:30:55 2008
+++ php-src/ext/phar/func_interceptors.cFri Sep 26 04:41:22 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: func_interceptors.c,v 1.20.2.18 2008/09/13 22:30:55 cellog Exp $ */
+/* $Id: func_interceptors.c,v 1.20.2.19 2008/09/26 04:41:22 cellog Exp $ */
 
 #include phar_internal.h
 
@@ -646,6 +646,7 @@
entry_len = (int) filename_length;
if (FAILURE == phar_get_archive(phar, arch, arch_len, 
NULL, 0, NULL TSRMLS_CC)) {
efree(arch);
+   efree(entry);
goto skip_phar;
}
 splitted:



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/phar func_interceptors.c

2008-09-25 Thread Greg Beaver

cellog  Fri Sep 26 04:41:41 2008 UTC

  Modified files:  
/php-src/ext/phar   func_interceptors.c 
  Log:
  MFB: fix obvious memory leak
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/func_interceptors.c?r1=1.27r2=1.28diff_format=u
Index: php-src/ext/phar/func_interceptors.c
diff -u php-src/ext/phar/func_interceptors.c:1.27 
php-src/ext/phar/func_interceptors.c:1.28
--- php-src/ext/phar/func_interceptors.c:1.27   Sat Sep 13 22:31:18 2008
+++ php-src/ext/phar/func_interceptors.cFri Sep 26 04:41:40 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: func_interceptors.c,v 1.27 2008/09/13 22:31:18 cellog Exp $ */
+/* $Id: func_interceptors.c,v 1.28 2008/09/26 04:41:40 cellog Exp $ */
 
 #include phar_internal.h
 
@@ -645,6 +645,7 @@
/* fopen within phar, if :// is not in the url, then 
prepend phar://archive/ */
entry_len = (int) filename_length;
if (FAILURE == phar_get_archive(phar, arch, arch_len, 
NULL, 0, NULL TSRMLS_CC)) {
+   efree(entry);
efree(arch);
goto skip_phar;
}



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar func_interceptors.c

2008-09-25 Thread Greg Beaver

cellog  Fri Sep 26 04:54:08 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   func_interceptors.c 
  Log:
  fix another memory leak
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/func_interceptors.c?r1=1.20.2.19r2=1.20.2.20diff_format=u
Index: php-src/ext/phar/func_interceptors.c
diff -u php-src/ext/phar/func_interceptors.c:1.20.2.19 
php-src/ext/phar/func_interceptors.c:1.20.2.20
--- php-src/ext/phar/func_interceptors.c:1.20.2.19  Fri Sep 26 04:41:22 2008
+++ php-src/ext/phar/func_interceptors.cFri Sep 26 04:54:08 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: func_interceptors.c,v 1.20.2.19 2008/09/26 04:41:22 cellog Exp $ */
+/* $Id: func_interceptors.c,v 1.20.2.20 2008/09/26 04:54:08 cellog Exp $ */
 
 #include phar_internal.h
 
@@ -686,6 +686,7 @@
int save_len;
 
 notfound:
+   efree(entry);
save = PHAR_G(cwd);
save_len = PHAR_G(cwd_len);
/* this file is not in the current directory, 
use the original path */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/phar func_interceptors.c

2008-09-25 Thread Greg Beaver

cellog  Fri Sep 26 04:54:23 2008 UTC

  Modified files:  
/php-src/ext/phar   func_interceptors.c 
  Log:
  MFB: fix another memory leak
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/func_interceptors.c?r1=1.28r2=1.29diff_format=u
Index: php-src/ext/phar/func_interceptors.c
diff -u php-src/ext/phar/func_interceptors.c:1.28 
php-src/ext/phar/func_interceptors.c:1.29
--- php-src/ext/phar/func_interceptors.c:1.28   Fri Sep 26 04:41:40 2008
+++ php-src/ext/phar/func_interceptors.cFri Sep 26 04:54:22 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: func_interceptors.c,v 1.28 2008/09/26 04:41:40 cellog Exp $ */
+/* $Id: func_interceptors.c,v 1.29 2008/09/26 04:54:22 cellog Exp $ */
 
 #include phar_internal.h
 
@@ -686,6 +686,7 @@
int save_len;
 
 notfound:
+   efree(entry);
save = PHAR_G(cwd);
save_len = PHAR_G(cwd_len);
/* this file is not in the current directory, 
use the original path */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build Makefile config.w32 confutils.js

[PHP-CVS] cvs: php-src /win32/build Makefile config.w32 confutils.js

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar func_interceptors.c

[PHP-CVS] cvs: php-src /ext/phar func_interceptors.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar func_interceptors.c

[PHP-CVS] cvs: php-src /ext/phar func_interceptors.c

7 matches

Site Navigation

Mail list logo

Footer information