date:20081106

[PHP-CVS] cvs: SVNROOT / run-conversion.php

2008-11-06 Thread Gwynne Raskind

gwynne  Fri Nov  7 06:52:28 2008 UTC

  Modified files:  
/SVNROOTrun-conversion.php 
  Log:
  add install phase for administrative files, embed is defunct
  
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.8&r2=1.9&diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.8 SVNROOT/run-conversion.php:1.9
--- SVNROOT/run-conversion.php:1.8  Fri Nov  7 00:11:20 2008
+++ SVNROOT/run-conversion.php  Fri Nov  7 06:52:27 2008
@@ -2,13 +2,14 @@
 
 // 
-
 // Constants
-$version = substr('$Revision: 1.8 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.9 $', strlen('$Revision: '), -2);
 
 $passes = array(
 'processcvs',   // Process CVS modules
 'svncreate',// Create various SVN repositories
 'cvs2svn',  // Run conversion for each repository
 'cleanup',  // Preform renaming and removes for each repo
+'install',  // Install hook scripts, authz databases, etc.
 );
 
 // 
-
@@ -155,6 +156,9 @@
 if ($isMetaModule) {
 $modprefix = $moduleName . '/';
 foreach(scandir_no_meta($cvspath) as $module) {
+if (count(scandir($cvspath . $module)) == 2) {
+continue; // empty dir
+}
 $this->optionsFileContents .= <addCVSModule($cvs_module);
@@ -483,6 +493,35 @@
 }
 
 // 
-
+// install pass
+function pass_install()
+{
+foreach ($GLOBALS['repoList'] as $repo) {
+$repo->installAdminFiles();
+}
+if (!file_exists($GLOBALS['options']['svnroot'] . DIRECTORY_SEPARATOR . 
'svn.authz')) {
+file_put_contents($GLOBALS['options']['svnroot'] . DIRECTORY_SEPARATOR 
. 'svn.authz', <

[PHP-CVS] cvs: SVNROOT / run-conversion.php

2008-11-06 Thread Gwynne Raskind

gwynne  Fri Nov  7 00:11:20 2008 UTC

  Modified files:  
/SVNROOTrun-conversion.php 
  Log:
  even more modules put in their proper places
  
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.7&r2=1.8&diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.7 SVNROOT/run-conversion.php:1.8
--- SVNROOT/run-conversion.php:1.7  Thu Nov  6 23:40:16 2008
+++ SVNROOT/run-conversion.php  Fri Nov  7 00:11:20 2008
@@ -2,7 +2,7 @@
 
 // 
-
 // Constants
-$version = substr('$Revision: 1.7 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.8 $', strlen('$Revision: '), -2);
 
 $passes = array(
 'processcvs',   // Process CVS modules
@@ -382,16 +382,17 @@
 if ($cvs_module == 'CVSROOT') {
 continue;
 }
-if (count(scandir($options['cvsroot'] . DIRECTORY_SEPARATOR . 
$cvs_module)) == 2) {// empty
+if (!is_dir($options['cvsroot'] . DIRECTORY_SEPARATOR . $cvs_module) ||
+count(scandir($options['cvsroot'] . DIRECTORY_SEPARATOR . 
$cvs_module)) == 2) {// empty
 continue;
 }
 if (in_array($cvs_module, array('smarty', 'smarty-web', 'php4.fubar', 
'php4.unused', 'peardoc.backup', 'php3', 'phpfi', 'livedocs',
-'Zend', 'functable', 'dialin', 'docstuff', 'jpgraph'))) {
+'Zend', 'functable', 'dialin', 'docstuff', 'jpgraph', 
'phpoc_de', 'phpdoc-fa_IR', 'lxr', 'portal', 'pres'))) {
 continue;
 } else if (in_array($cvs_module, array('php-gtk', 'php-gtk-doc', 
'old-php-gtk-modules'))) {
 $repoList['gtk']->addCVSModule($cvs_module);
 } else if (in_array($cvs_module, array('TSRM', 'ZendAPI', 
'ZendEngine2', 'php-src', 'pecl', 'pecl4win', 'php-objc', 'php-lang',
-'win-installer', 'bindlib_w32', 'zlib', 'pdo-specs', 
'php-internals-win'))) {
+'win-installer', 'bindlib_w32', 'zlib', 'pdo-specs', 
'php-internals-win', 'fastcgi-isapi'))) {
 $repoList['src']->addCVSModule($cvs_module, $cvs_module == 'pecl');
 } else if ($cvs_module == 'phd') {
 $repoList['phd']->addCVSModule($cvs_module);
@@ -399,10 +400,10 @@
 $repoList['gd']->addCVSModule($cvs_module);
 } else if (in_array($cvs_module, array('pear', 'pearbot', 'pear-core', 
'peardoc'))) {
 $repoList['pear1']->addCVSModule($cvs_module, $cvs_module == 
'pear');
+} else if (substr($cvs_module, -3) == "web" || in_array($cvs_module, 
array('pres2', 'presentations', 'bugtracker'))) {
+$repoList['web']->addCVSModule($cvs_module);
 } else if (strncmp($cvs_module, "phpdoc", 6) == 0) {
 $repoList['doc']->addCVSModule($cvs_module);
-} else if (substr($cvs_module, -3) == "web") {
-$repoList['web']->addCVSModule($cvs_module);
 } else {
 $repoList['other']->addCVSModule($cvs_module);
 }



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

[PHP-CVS] cvs: SVNROOT / run-conversion.php

2008-11-06 Thread Gwynne Raskind

gwynne  Thu Nov  6 23:40:16 2008 UTC

  Modified files:  
/SVNROOTrun-conversion.php 
  Log:
  more modules put in their proper places
  
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.6&r2=1.7&diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.6 SVNROOT/run-conversion.php:1.7
--- SVNROOT/run-conversion.php:1.6  Thu Nov  6 23:38:51 2008
+++ SVNROOT/run-conversion.php  Thu Nov  6 23:40:16 2008
@@ -2,7 +2,7 @@
 
 // 
-
 // Constants
-$version = substr('$Revision: 1.6 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.7 $', strlen('$Revision: '), -2);
 
 $passes = array(
 'processcvs',   // Process CVS modules
@@ -391,7 +391,7 @@
 } else if (in_array($cvs_module, array('php-gtk', 'php-gtk-doc', 
'old-php-gtk-modules'))) {
 $repoList['gtk']->addCVSModule($cvs_module);
 } else if (in_array($cvs_module, array('TSRM', 'ZendAPI', 
'ZendEngine2', 'php-src', 'pecl', 'pecl4win', 'php-objc', 'php-lang',
-'win-installer', 'bindlib_w32', 'zlib', 'pdo-specs'))) {
+'win-installer', 'bindlib_w32', 'zlib', 'pdo-specs', 
'php-internals-win'))) {
 $repoList['src']->addCVSModule($cvs_module, $cvs_module == 'pecl');
 } else if ($cvs_module == 'phd') {
 $repoList['phd']->addCVSModule($cvs_module);



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

[PHP-CVS] cvs: SVNROOT / run-conversion.php

2008-11-06 Thread Gwynne Raskind

gwynne  Thu Nov  6 23:38:52 2008 UTC

  Modified files:  
/SVNROOTrun-conversion.php 
  Log:
  corrected fixup rules, allow mkdir mode in fixup, add gd repo, add some 
unused modules to the exclusion list
  http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.5&r2=1.6&diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.5 SVNROOT/run-conversion.php:1.6
--- SVNROOT/run-conversion.php:1.5  Wed Nov  5 18:15:59 2008
+++ SVNROOT/run-conversion.php  Thu Nov  6 23:38:51 2008
@@ -2,7 +2,7 @@
 
 // 
-
 // Constants
-$version = substr('$Revision: 1.5 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.6 $', strlen('$Revision: '), -2);
 
 $passes = array(
 'processcvs',   // Process CVS modules
@@ -287,35 +287,53 @@
 $converter->run();
 }
 
-public function fixupRepository($ignoreErrors = FALSE)
+private function executeSVNCommand($cmd)
+{
+$realCommand = "exec svn {$cmd} 2>&1";
+v(2, "Running: '{$realCommand}'...");
+exec($command, $output, $exitstatus);
+if ($exitstatus != 0) {
+error("\nAn error occurred. Exit status was {$exitstatus}. 
Output:\n" . implode("\n", $output) . "\n", $exitstatus);
+}
+v(2, " done.\n");
+return $output;
+}
+
+private function mkdirPath($path, $message)
+{
+$this->executeSVNCommand('mkdir -m ' . escapeshellarg($message) .
+ ' file:///' . 
escapeshellarg($this->svnRepositoryPath) . '/' . escapeshellarg($path));
+}
+
+private function deletePath($path, $message)
+{
+$this->executeSVNCommand('rm -m ' . escapeshellarg($message) .
+ ' file:///' . 
escapeshellarg($this->svnRepositoryPath) . '/' . escapeshellarg($path));
+}
+
+private function movePath($srcPath, $dstPath, $message)
+{
+$this->executeSVNCommand('mv -m ' . escapeshellarg($message) .
+ ' file:///' . 
escapeshellarg($this->svnRepositoryPath) . '/' . escapeshellarg($srcPath) .
+ ' file:///' . 
escapeshellarg($this->svnRepositoryPath) . '/' . escapeshellarg($dstPath));
+}
+
+public function fixupRepository()
 {
 v(1, "Executing fixup commands for repository 
'{$this->repositoryName}'...\n");
+$message = '[SVN CONVERSION] Reorganization in repository 
{$this->repositoryName}.';
 foreach ($renamingRules as $rule) {
 switch ($rule['mode']) {
-case 'move_all':
-error("Moving tags and branches is not yet supported! TODO 
IMPLEMENT ME.\n");
+case 'mkdir':
+$this->mkdirPath($rule['srcPath'], $message);
 break;
 case 'delete':
-$command  = "exec svn rm ";
-$command .= "-m '[SVN CONVERSION] Reorganization in 
repository {$this->repositoryName}.' ";
-$command .= "file:///" . 
escapeshellarg($this->svnRepositoryPath) . "/" . 
escapeshellarg($rule['srcPath']) . " 2>&1";
+$this->deletePath($rule['srcPath'], $message);
 break;
 case 'move':
-$command  = "exec svn mv ";
-$command .= "-m '[SVN CONVERSION] Reorganization in 
repository {$this->repositoryName}.' ";
-$command .= "file:///" . 
escapeshellarg($this->svnRepositoryPath) . "/" . 
escapeshellarg($rule['srcPath']) . " ";
-$command .= "file:///" . 
escapeshellarg($this->svnRepositoryPath) . "/" . 
escapeshellarg($rule['dstPath']) . " 2>&1";
+$this->movePath($rule['srcPath'], $rule['dstPath'], 
$message);
 break;
 }
-v(2, "Running: '{$command}'...");
-exec($command, $output, $exitstatus);
-if ($exitstatus != 0 && $ignoreErrors === FALSE) {
-error("\nAn error occurred. Exit status was {$exitstatus}. 
Output:\n" . implode("\n", $output) . "\n", $exitstatus);
-} else if ($exitStatus != 0) {
-v(2, " warning: an error occurred\n");
-} else {
-v(2, " done.\n");
-}
 }
 v(1, "Done fixing up.");
 }
@@ -356,6 +374,7 @@
 $repoList['web'] = new Repository('php-web');
 $repoList['phd'] = new Repository('phd');
 $repoList['pear1'] = new Repository('pear');
+$repoList['gd'] = new Repository('gd');
 $repoList['other'] = new Repository('other');
 
 $cvs_modules = scandir_no_meta($options['cvsroot']);
@@ -366,7 +385,8 @@
 if (count(scandir($options['cvsroot'] . DIRECTORY_SEPARATOR . 
$cvs_module)) == 2) {// empty
 continue

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2008-11-06 Thread David Soria Parra

dsp Thu Nov  6 22:12:12 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  Use right format
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.368&r2=1.2027.2.547.2.965.2.369&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.368 
php-src/NEWS:1.2027.2.547.2.965.2.369
--- php-src/NEWS:1.2027.2.547.2.965.2.368   Thu Nov  6 21:56:06 2008
+++ php-src/NEWSThu Nov  6 22:12:12 2008
@@ -17,7 +17,7 @@
 - Added concatenation option to bz2.decompress stream filter.
   (Keisial at gmail dot com, Greg)
 - Added support for using compressed connections with PDO_mysql. (Johannes)
-- Added missing suncc compiler flags as requested by feature request #46513.
+- Implemented FR #46513 (Missing compiler flags for suncc). 
   (David Soria Parra)
 
 - Deprecated define_syslog_variables(). (Kalle)



-- 
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) / NEWS

2008-11-06 Thread David Soria Parra

dsp Thu Nov  6 21:56:08 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  Refer to a feature request that contains a better description of the flags
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.367&r2=1.2027.2.547.2.965.2.368&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.367 
php-src/NEWS:1.2027.2.547.2.965.2.368
--- php-src/NEWS:1.2027.2.547.2.965.2.367   Thu Nov  6 20:42:11 2008
+++ php-src/NEWSThu Nov  6 21:56:06 2008
@@ -17,7 +17,8 @@
 - Added concatenation option to bz2.decompress stream filter.
   (Keisial at gmail dot com, Greg)
 - Added support for using compressed connections with PDO_mysql. (Johannes)
-- Added default flags for suncc compiler. (David Soria Parra)
+- Added missing suncc compiler flags as requested by feature request #46513.
+  (David Soria Parra)
 
 - Deprecated define_syslog_variables(). (Kalle)
 



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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS configure.in /main php_version.h

2008-11-06 Thread Ilia Alshanetsky

iliaa   Thu Nov  6 21:53:49 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS configure.in 
/php-src/main   php_version.h 
  Log:
  Back to dev
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1305&r2=1.2027.2.547.2.1306&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1305 php-src/NEWS:1.2027.2.547.2.1306
--- php-src/NEWS:1.2027.2.547.2.1305Thu Nov  6 21:50:36 2008
+++ php-src/NEWSThu Nov  6 21:53:48 2008
@@ -1,5 +1,7 @@
 PHPNEWS
 |||
+?? Nov 2008, PHP 5.2.7
+
 06 Nov 2008, PHP 5.2.7RC3
 - Added PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION,
   PHP_EXTRA_VERSION, PHP_VERSION_ID, PHP_ZTS and PHP_DEBUG constants. (Pierre)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.110&r2=1.579.2.52.2.111&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.110 
php-src/configure.in:1.579.2.52.2.111
--- php-src/configure.in:1.579.2.52.2.110   Thu Nov  6 21:50:35 2008
+++ php-src/configure.inThu Nov  6 21:53:48 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.110 2008/11/06 21:50:35 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.111 2008/11/06 21:53:48 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=7
-PHP_EXTRA_VERSION="RC3"
+PHP_EXTRA_VERSION="RC4-dev"
 
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.74&r2=1.112.2.37.2.75&diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.74 
php-src/main/php_version.h:1.112.2.37.2.75
--- php-src/main/php_version.h:1.112.2.37.2.74  Thu Nov  6 21:50:36 2008
+++ php-src/main/php_version.h  Thu Nov  6 21:53:48 2008
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 7
-#define PHP_EXTRA_VERSION "RC3"
-#define PHP_VERSION "5.2.7RC3"
+#define PHP_EXTRA_VERSION "RC4-dev"
+#define PHP_VERSION "5.2.7RC4-dev"
 #define PHP_VERSION_ID 50207



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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS configure.in /main php_version.h

2008-11-06 Thread Ilia Alshanetsky

iliaa   Thu Nov  6 21:50:37 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in NEWS 
/php-src/main   php_version.h 
  Log:
  5.2.7RC3
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.109&r2=1.579.2.52.2.110&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.109 
php-src/configure.in:1.579.2.52.2.110
--- php-src/configure.in:1.579.2.52.2.109   Thu Oct 23 22:38:19 2008
+++ php-src/configure.inThu Nov  6 21:50:35 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.109 2008/10/23 22:38:19 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.110 2008/11/06 21:50:35 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=7
-PHP_EXTRA_VERSION="RC3-dev"
+PHP_EXTRA_VERSION="RC3"
 
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1304&r2=1.2027.2.547.2.1305&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1304 php-src/NEWS:1.2027.2.547.2.1305
--- php-src/NEWS:1.2027.2.547.2.1304Thu Nov  6 01:36:40 2008
+++ php-src/NEWSThu Nov  6 21:50:36 2008
@@ -1,6 +1,6 @@
 PHPNEWS
 |||
-?? Nov 2008, PHP 5.2.7RC3
+06 Nov 2008, PHP 5.2.7RC3
 - Added PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION,
   PHP_EXTRA_VERSION, PHP_VERSION_ID, PHP_ZTS and PHP_DEBUG constants. (Pierre)
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.73&r2=1.112.2.37.2.74&diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.73 
php-src/main/php_version.h:1.112.2.37.2.74
--- php-src/main/php_version.h:1.112.2.37.2.73  Thu Oct 23 22:38:19 2008
+++ php-src/main/php_version.h  Thu Nov  6 21:50:36 2008
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 7
-#define PHP_EXTRA_VERSION "RC3-dev"
-#define PHP_VERSION "5.2.7RC3-dev"
+#define PHP_EXTRA_VERSION "RC3"
+#define PHP_VERSION "5.2.7RC3"
 #define PHP_VERSION_ID 50207



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

[PHP-CVS] cvs: php-src / README.RELEASE_PROCESS

2008-11-06 Thread Philip Olson

philip  Thu Nov  6 21:38:12 2008 UTC

  Modified files:  
/php-srcREADME.RELEASE_PROCESS 
  Log:
  MFB: Added the "update INSTALL and win32/install.txt" tasks
  
  
http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.13&r2=1.14&diff_format=u
Index: php-src/README.RELEASE_PROCESS
diff -u php-src/README.RELEASE_PROCESS:1.13 php-src/README.RELEASE_PROCESS:1.14
--- php-src/README.RELEASE_PROCESS:1.13 Wed Nov  5 07:25:12 2008
+++ php-src/README.RELEASE_PROCESS  Thu Nov  6 21:38:12 2008
@@ -129,6 +129,9 @@
 
  a. ``cvs commit include/version.inc include/releases.inc``
 
+5. For the first RC, write the doc team ([EMAIL PROTECTED]) about updating the 
+INSTALL and win32/install.txt files which are generated from the PHP manual 
sources.
+
 Rolling a stable release
 
 



-- 
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) / README.RELEASE_PROCESS

2008-11-06 Thread Philip Olson

philip  Thu Nov  6 21:35:42 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcREADME.RELEASE_PROCESS 
  Log:
  Added the "update INSTALL and win32/install.txt" tasks
  
  
http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.1.2.13&r2=1.1.2.14&diff_format=u
Index: php-src/README.RELEASE_PROCESS
diff -u php-src/README.RELEASE_PROCESS:1.1.2.13 
php-src/README.RELEASE_PROCESS:1.1.2.14
--- php-src/README.RELEASE_PROCESS:1.1.2.13 Wed Nov  5 07:25:18 2008
+++ php-src/README.RELEASE_PROCESS  Thu Nov  6 21:35:42 2008
@@ -129,6 +129,9 @@
 
  a. ``cvs commit include/version.inc include/releases.inc``
 
+5. For the first RC, write the doc team ([EMAIL PROTECTED]) about updating the 
+INSTALL and win32/install.txt files which are generated from the PHP manual 
sources.
+
 Rolling a stable release
 
 



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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS acinclude.m4 configure.in

2008-11-06 Thread Hannes Magnusson

On Thu, Nov 6, 2008 at 22:14, David Soria Parra <[EMAIL PROTECTED]> wrote:
> Hannes Magnusson wrote:
>>
>> On Thu, Nov 6, 2008 at 21:42, David Soria Parra <[EMAIL PROTECTED]> wrote:
>>>
>>> dsp Thu Nov  6 20:42:12 2008 UTC
>>>
>>>  Modified files:  (Branch: PHP_5_3)
>>>   /php-srcacinclude.m4 configure.in NEWS
>>>  Log:
>>>  MFH: Detect Sun C compiler and set default flags if it is used
>>
>> [...]
>>>
>>> +- Added default flags for suncc compiler. (David Soria Parra)
>>
>> Thats great.. what are those default flags and "why should I care"?
>
> Hi Hannes,
>
> so the complete list is at
> http://docs.sun.com/app/docs/doc/819-5265/bjapp?a=view but let me get

Sorry for not being literal enough: How should the end-user know what
this news entry means, and should he pay special attentions to it?
Should he search our docs for "which flags does PHP set by default for
suncc?"

Being slightly more verbose in the NEWS isn't a bad thing - and if
this is something "important" then you should document it too.

-Hannes

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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS acinclude.m4 configure.in

2008-11-06 Thread David Soria Parra


Hannes Magnusson wrote:

On Thu, Nov 6, 2008 at 21:42, David Soria Parra <[EMAIL PROTECTED]> wrote:

dsp Thu Nov  6 20:42:12 2008 UTC

 Modified files:  (Branch: PHP_5_3)
   /php-srcacinclude.m4 configure.in NEWS
 Log:
 MFH: Detect Sun C compiler and set default flags if it is used

[...]

+- Added default flags for suncc compiler. (David Soria Parra)


Thats great.. what are those default flags and "why should I care"?

Hi Hannes,

so the complete list is at 
http://docs.sun.com/app/docs/doc/819-5265/bjapp?a=view but let me get 
through the most important parts of the list:


xtarget=native
Causes to generate processor specific code.

xalias_level=basic
does optimization based on basic assumptions about the c types e.g. 
float* will not point to int*.


fsimple=2
will simplify floating point arithmetic

xipo=1
will do an analysis of all object files and try to optimize across all 
object files.


xlibmopt
optimize math routines, according to the documentation this might result 
in slight differences to the std math lib. But I asked some sun 
engineers and it was considered safe.


So actually I picked options that usually are set by the -fast option, 
but removed the onces that might cause problems. That's why the list is 
that long and that's even why I don't use -xO5 but -xO4 to not run in 
errors (this was recommand by some webstack guy).


The only sad thing is that you still need to set the compiler using the 
CC env variable as by default we are looking for gcc and ignoring other 
compilers even though they are the default cc compiler on those 
machines. I acutally think that this is not desirable.


David

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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS acinclude.m4 configure.in

2008-11-06 Thread Hannes Magnusson

On Thu, Nov 6, 2008 at 21:42, David Soria Parra <[EMAIL PROTECTED]> wrote:
> dsp Thu Nov  6 20:42:12 2008 UTC
>
>  Modified files:  (Branch: PHP_5_3)
>/php-srcacinclude.m4 configure.in NEWS
>  Log:
>  MFH: Detect Sun C compiler and set default flags if it is used
[...]
> +- Added default flags for suncc compiler. (David Soria Parra)

Thats great.. what are those default flags and "why should I care"?

-Hannes

-- 
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) / NEWS acinclude.m4 configure.in

2008-11-06 Thread David Soria Parra

dsp Thu Nov  6 20:42:12 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcacinclude.m4 configure.in NEWS 
  Log:
  MFH: Detect Sun C compiler and set default flags if it is used
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.26.2.10&r2=1.332.2.14.2.26.2.11&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.14.2.26.2.10 
php-src/acinclude.m4:1.332.2.14.2.26.2.11
--- php-src/acinclude.m4:1.332.2.14.2.26.2.10   Mon Sep  8 10:24:25 2008
+++ php-src/acinclude.m4Thu Nov  6 20:42:11 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.332.2.14.2.26.2.10 2008/09/08 10:24:25 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.332.2.14.2.26.2.11 2008/11/06 20:42:11 dsp Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2766,6 +2766,22 @@
   )
 ])
 
+dnl PHP_DETECT_SUNCC
+dnl Detect if the systems default compiler is suncc.
+dnl We also set some usefull CFLAGS if the user didn't set any
+AC_DEFUN([PHP_DETECT_SUNCC],[
+  SUNCC="no"
+  AC_MSG_CHECKING([for suncc])
+  AC_EGREP_CPP([^__SUNPRO_C], [__SUNPRO_C],
+SUNCC="no"
+AC_MSG_RESULT([no]),
+SUNCC="yes"
+test -n "$auto_cflags" && CFLAGS="-fsimple=2 -xnorunpath -xO4 
-xalias_level=basic -xipo=1 -xlibmopt -xprefetch_level=1 -xprefetch=auto 
-xstrconst -xtarget=native -zlazyload"
+GCC=""
+AC_MSG_RESULT([yes])
+  )
+])
+
 dnl
 dnl PHP_CRYPT_R_STYLE
 dnl detect the style of crypt_r() is any is available
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.31&r2=1.579.2.52.2.77.2.32&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.77.2.31 
php-src/configure.in:1.579.2.52.2.77.2.32
--- php-src/configure.in:1.579.2.52.2.77.2.31   Mon Sep  1 20:51:57 2008
+++ php-src/configure.inThu Nov  6 20:42:11 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.77.2.31 2008/09/01 20:51:57 johannes Exp $ 
-*- autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.77.2.32 2008/11/06 20:42:11 dsp Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -142,6 +142,7 @@
 
 AC_PROG_CC
 PHP_DETECT_ICC
+PHP_DETECT_SUNCC
 AC_PROG_CC_C_O
 dnl Change to AC_PROG_CC_STDC when we start requiring a post-2.13 autoconf
 dnl AC_PROG_CC_STDC
@@ -214,6 +215,10 @@
   CFLAGS="$CFLAGS -ieee"
 fi
 ;;
+  sparc*)
+if test "$SUNCC" = "yes"; then
+  CFLAGS="$CFLAGS -xmemalign=8s"
+fi
 esac
 
 dnl activate some gcc specific optimizations for gcc >= 4
@@ -788,6 +793,15 @@
 CFLAGS="$CFLAGS -O0"
 CXXFLAGS="$CXXFLAGS -O0"
   fi
+  if test "$SUNCC" = "yes"; then
+if -n "$auto_cflags"; then
+  CFLAGS="-g"
+  CXXFLAGS="-g"
+else
+  CFLAGS="$CFLAGS -g"
+  CXXFLAGS="$CFLAGS -g"
+fi
+  fi
 else
   PHP_DEBUG=0
   ZEND_DEBUG=no
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.366&r2=1.2027.2.547.2.965.2.367&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.366 
php-src/NEWS:1.2027.2.547.2.965.2.367
--- php-src/NEWS:1.2027.2.547.2.965.2.366   Thu Nov  6 01:38:56 2008
+++ php-src/NEWSThu Nov  6 20:42:11 2008
@@ -17,6 +17,7 @@
 - Added concatenation option to bz2.decompress stream filter.
   (Keisial at gmail dot com, Greg)
 - Added support for using compressed connections with PDO_mysql. (Johannes)
+- Added default flags for suncc compiler. (David Soria Parra)
 
 - Deprecated define_syslog_variables(). (Kalle)
 



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

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in

2008-11-06 Thread David Soria Parra

dsp Thu Nov  6 20:38:02 2008 UTC

  Modified files:  
/php-srcacinclude.m4 configure.in 
  Log:
  Detect Sun C compiler and set default flags if it is used
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.390&r2=1.391&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.390 php-src/acinclude.m4:1.391
--- php-src/acinclude.m4:1.390  Mon Sep  8 10:24:05 2008
+++ php-src/acinclude.m4Thu Nov  6 20:38:02 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.390 2008/09/08 10:24:05 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.391 2008/11/06 20:38:02 dsp Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2766,6 +2766,22 @@
   )
 ])
 
+dnl PHP_DETECT_SUNCC
+dnl Detect if the systems default compiler is suncc.
+dnl We also set some usefull CFLAGS if the user didn't set any
+AC_DEFUN([PHP_DETECT_SUNCC],[
+  SUNCC="no"
+  AC_MSG_CHECKING([for suncc])
+  AC_EGREP_CPP([^__SUNPRO_C], [__SUNPRO_C],
+SUNCC="no"
+AC_MSG_RESULT([no]),
+SUNCC="yes"
+test -n "$auto_cflags" && CFLAGS="-fsimple=2 -xnorunpath -xO4 
-xalias_level=basic -xipo=1 -xlibmopt -xprefetch_level=1 -xprefetch=auto 
-xstrconst -xtarget=native -zlazyload"
+GCC=""
+AC_MSG_RESULT([yes])
+  )
+])
+
 dnl
 dnl PHP_CRYPT_R_STYLE
 dnl detect the style of crypt_r() is any is available
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.664&r2=1.665&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.664 php-src/configure.in:1.665
--- php-src/configure.in:1.664  Wed Jul 30 23:31:41 2008
+++ php-src/configure.inThu Nov  6 20:38:02 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.664 2008/07/30 23:31:41 jani Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.665 2008/11/06 20:38:02 dsp Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -142,6 +142,7 @@
 
 AC_PROG_CC
 PHP_DETECT_ICC
+PHP_DETECT_SUNCC
 AC_PROG_CC_C_O
 dnl Change to AC_PROG_CC_STDC when we start requiring a post-2.13 autoconf
 dnl AC_PROG_CC_STDC
@@ -214,6 +215,10 @@
   CFLAGS="$CFLAGS -ieee"
 fi
 ;;
+  sparc*)
+if test "$SUNCC" = "yes"; then
+  CFLAGS="$CFLAGS -xmemalign=8s"
+fi
 esac
 
 dnl activate some gcc specific optimizations for gcc >= 4
@@ -788,6 +793,15 @@
 CFLAGS="$CFLAGS -O0"
 CXXFLAGS="$CXXFLAGS -O0"
   fi
+  if test "$SUNCC" = "yes"; then
+if -n "$auto_cflags"; then
+  CFLAGS="-g"
+  CXXFLAGS="-g"
+else
+  CFLAGS="$CFLAGS -g"
+  CXXFLAGS="$CFLAGS -g"
+fi
+  fi
 else
   PHP_DEBUG=0
   ZEND_DEBUG=no



-- 
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/mysqlnd config-win.h mysqlnd_charset.c mysqlnd_portability.h mysqlnd_wireprotocol.c

2008-11-06 Thread Andrey Hristov

andrey  Thu Nov  6 18:48:55 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndconfig-win.h mysqlnd_charset.c 
mysqlnd_portability.h mysqlnd_wireprotocol.c 
  Log:
  MFB: More Windows types cleanup
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config-win.h?r1=1.1.2.6&r2=1.1.2.7&diff_format=u
Index: php-src/ext/mysqlnd/config-win.h
diff -u php-src/ext/mysqlnd/config-win.h:1.1.2.6 
php-src/ext/mysqlnd/config-win.h:1.1.2.7
--- php-src/ext/mysqlnd/config-win.h:1.1.2.6Thu Nov  6 14:21:50 2008
+++ php-src/ext/mysqlnd/config-win.hThu Nov  6 18:48:55 2008
@@ -3,6 +3,9 @@
 
 /* Defines for Win32 to make it compatible for MySQL */
 
+#ifndef _MYSQLND_CONFIG_WIN_H
+#define _MYSQLND_CONFIG_WIN_H
+
 #include 
 #include 
 #include   /* Because of rint() */
@@ -10,7 +13,7 @@
 #include 
 #include 
 
-#include "win32/php_stdint.h"
+#include 
 
 #ifndef HAVE_INT8_T
 #define HAVE_INT8_T
@@ -61,35 +64,35 @@
 /* Optimized store functions for Intel x86 */
 
 #define sint2korr(A)   (*((int16_t *) (A)))
-#define sint3korr(A)   ((int32_t) uchar) (A)[2]) & 128) ? \
+#define sint3korr(A)   ((int32_t) zend_uchar) (A)[2]) & 128) ? \

(((uint32_t) 255L << 24) | \
-   
(((uint32_t) (uchar) (A)[2]) << 16) |\
-   
(((uint32_t) (uchar) (A)[1]) << 8) | \
-   
((uint32_t) (uchar) (A)[0])) : \
-   
(((uint32_t) (uchar) (A)[2]) << 16) |\
-   
(((uint32_t) (uchar) (A)[1]) << 8) | \
-   
((uint32_t) (uchar) (A)[0])))
+   
(((uint32_t) (zend_uchar) (A)[2]) << 16) |\
+   
(((uint32_t) (zend_uchar) (A)[1]) << 8) | \
+   
((uint32_t) (zend_uchar) (A)[0])) : \
+   
(((uint32_t) (zend_uchar) (A)[2]) << 16) |\
+   
(((uint32_t) (zend_uchar) (A)[1]) << 8) | \
+   
((uint32_t) (zend_uchar) (A)[0])))
 #define sint4korr(A)   (*((int32_t *) (A)))
 #define uint2korr(A)   (*((uint16_t *) (A)))
 #define uint3korr(A)   (int32_t) (*((uint32_t *) (A)) & 0xFF)
 #define uint4korr(A)   (*((uint32_t *) (A)))
-#define uint5korr(A)   ((uint64_t)(((uint32_t) ((uchar) (A)[0])) +\
-   
(((uint32_t) ((uchar) (A)[1])) << 8) +\
-   
(((uint32_t) ((uchar) (A)[2])) << 16) +\
-   
(((uint32_t) ((uchar) (A)[3])) << 24)) +\
-   
(((uint64_t) ((uchar) (A)[4])) << 32))
+#define uint5korr(A)   ((uint64_t)(((uint32_t) ((zend_uchar) (A)[0])) +\
+   
(((uint32_t) ((zend_uchar) (A)[1])) << 8) +\
+   
(((uint32_t) ((zend_uchar) (A)[2])) << 16) +\
+   
(((uint32_t) ((zend_uchar) (A)[3])) << 24)) +\
+   
(((uint64_t) ((zend_uchar) (A)[4])) << 32))
 #define uint8korr(A)   (*((uint64_t *) (A)))
 #define sint8korr(A)   (*((int64_t *) (A)))
 #define int2store(T,A) *((uint16_t*) (T))= (uint16_t) (A)
-#define int3store(T,A) {   *(T)=  (uchar) ((A));\
-   *(T+1)=(uchar) 
(((uint32_t) (A) >> 8));\
-   *(T+2)=(uchar) 
(((A) >> 16)); }
+#define int3store(T,A) {   *(T)=  (zend_uchar) ((A));\
+   
*(T+1)=(zend_uchar) (((uint32_t) (A) >> 8));\
+   
*(T+2)=(zend_uchar) (((A) >> 16)); }
 #define int4store(T,A) *((int32_t *) (T))= (int32_t) (A)
-#define int5store(T,A) {   *(T)= (uchar)((A));\
-   *((T)+1)=(uchar) (((A) 
>> 8));\
-

[PHP-CVS] cvs: php-src /ext/mysqlnd config-win.h mysqlnd_charset.c mysqlnd_portability.h mysqlnd_wireprotocol.c

2008-11-06 Thread Andrey Hristov

andrey  Thu Nov  6 18:37:32 2008 UTC

  Modified files:  
/php-src/ext/mysqlndconfig-win.h mysqlnd_charset.c 
mysqlnd_portability.h mysqlnd_wireprotocol.c 
  Log:
  More type fixes for Windows
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config-win.h?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqlnd/config-win.h
diff -u php-src/ext/mysqlnd/config-win.h:1.5 
php-src/ext/mysqlnd/config-win.h:1.6
--- php-src/ext/mysqlnd/config-win.h:1.5Thu Nov  6 14:20:19 2008
+++ php-src/ext/mysqlnd/config-win.hThu Nov  6 18:37:32 2008
@@ -3,6 +3,9 @@
 
 /* Defines for Win32 to make it compatible for MySQL */
 
+#ifndef _MYSQLND_CONFIG_WIN_H
+#define _MYSQLND_CONFIG_WIN_H
+
 #include 
 #include 
 #include   /* Because of rint() */
@@ -10,7 +13,7 @@
 #include 
 #include 
 
-#include "win32/php_stdint.h"
+#include 
 
 #ifndef HAVE_INT8_T
 #define HAVE_INT8_T
@@ -61,35 +64,35 @@
 /* Optimized store functions for Intel x86 */
 
 #define sint2korr(A)   (*((int16_t *) (A)))
-#define sint3korr(A)   ((int32_t) uchar) (A)[2]) & 128) ? \
+#define sint3korr(A)   ((int32_t) zend_uchar) (A)[2]) & 128) ? \

(((uint32_t) 255L << 24) | \
-   
(((uint32_t) (uchar) (A)[2]) << 16) |\
-   
(((uint32_t) (uchar) (A)[1]) << 8) | \
-   
((uint32_t) (uchar) (A)[0])) : \
-   
(((uint32_t) (uchar) (A)[2]) << 16) |\
-   
(((uint32_t) (uchar) (A)[1]) << 8) | \
-   
((uint32_t) (uchar) (A)[0])))
+   
(((uint32_t) (zend_uchar) (A)[2]) << 16) |\
+   
(((uint32_t) (zend_uchar) (A)[1]) << 8) | \
+   
((uint32_t) (zend_uchar) (A)[0])) : \
+   
(((uint32_t) (zend_uchar) (A)[2]) << 16) |\
+   
(((uint32_t) (zend_uchar) (A)[1]) << 8) | \
+   
((uint32_t) (zend_uchar) (A)[0])))
 #define sint4korr(A)   (*((int32_t *) (A)))
 #define uint2korr(A)   (*((uint16_t *) (A)))
 #define uint3korr(A)   (int32_t) (*((uint32_t *) (A)) & 0xFF)
 #define uint4korr(A)   (*((uint32_t *) (A)))
-#define uint5korr(A)   ((uint64_t)(((uint32_t) ((uchar) (A)[0])) +\
-   
(((uint32_t) ((uchar) (A)[1])) << 8) +\
-   
(((uint32_t) ((uchar) (A)[2])) << 16) +\
-   
(((uint32_t) ((uchar) (A)[3])) << 24)) +\
-   
(((uint64_t) ((uchar) (A)[4])) << 32))
+#define uint5korr(A)   ((uint64_t)(((uint32_t) ((zend_uchar) (A)[0])) +\
+   
(((uint32_t) ((zend_uchar) (A)[1])) << 8) +\
+   
(((uint32_t) ((zend_uchar) (A)[2])) << 16) +\
+   
(((uint32_t) ((zend_uchar) (A)[3])) << 24)) +\
+   
(((uint64_t) ((zend_uchar) (A)[4])) << 32))
 #define uint8korr(A)   (*((uint64_t *) (A)))
 #define sint8korr(A)   (*((int64_t *) (A)))
 #define int2store(T,A) *((uint16_t*) (T))= (uint16_t) (A)
-#define int3store(T,A) {   *(T)=  (uchar) ((A));\
-   *(T+1)=(uchar) 
(((uint32_t) (A) >> 8));\
-   *(T+2)=(uchar) 
(((A) >> 16)); }
+#define int3store(T,A) {   *(T)=  (zend_uchar) ((A));\
+   
*(T+1)=(zend_uchar) (((uint32_t) (A) >> 8));\
+   
*(T+2)=(zend_uchar) (((A) >> 16)); }
 #define int4store(T,A) *((int32_t *) (T))= (int32_t) (A)
-#define int5store(T,A) {   *(T)= (uchar)((A));\
-   *((T)+1)=(uchar) (((A) 
>> 8));\
-   *((T)+2)=(ucha

[PHP-CVS] cvs: php-src /ext/fileinfo/libmagic apprentice.c

2008-11-06 Thread Pierre-Alain Joye

pajoye  Thu Nov  6 14:24:24 2008 UTC

  Modified files:  
/php-src/ext/fileinfo/libmagic  apprentice.c 
  Log:
  - fix build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/apprentice.c?r1=1.18&r2=1.19&diff_format=u
Index: php-src/ext/fileinfo/libmagic/apprentice.c
diff -u php-src/ext/fileinfo/libmagic/apprentice.c:1.18 
php-src/ext/fileinfo/libmagic/apprentice.c:1.19
--- php-src/ext/fileinfo/libmagic/apprentice.c:1.18 Thu Nov  6 13:56:49 2008
+++ php-src/ext/fileinfo/libmagic/apprentice.c  Thu Nov  6 14:24:24 2008
@@ -607,7 +607,7 @@
} else {
 
/* read and parse this file */
-   for (ms->line = 1; (line = php_stream_get_line(stream, buffer , 
BUFSIZ, &line_len)) != NULL; ms->line++) {
+   for (ms->line = 1; (line = php_stream_get_line(stream, 
ZSTR(buffer), BUFSIZ, &line_len)) != NULL; ms->line++) {
if (line_len == 0) /* null line, garbage, etc */
continue;
 



-- 
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/mysqlnd config-win.h mysqlnd_portability.h

2008-11-06 Thread Andrey Hristov

andrey  Thu Nov  6 14:21:51 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndconfig-win.h mysqlnd_portability.h 
  Log:
  MFH: Use win32/php_stdint.h for stdint types on Windows
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config-win.h?r1=1.1.2.5&r2=1.1.2.6&diff_format=u
Index: php-src/ext/mysqlnd/config-win.h
diff -u php-src/ext/mysqlnd/config-win.h:1.1.2.5 
php-src/ext/mysqlnd/config-win.h:1.1.2.6
--- php-src/ext/mysqlnd/config-win.h:1.1.2.5Thu Nov  6 11:29:20 2008
+++ php-src/ext/mysqlnd/config-win.hThu Nov  6 14:21:50 2008
@@ -10,6 +10,33 @@
 #include 
 #include 
 
+#include "win32/php_stdint.h"
+
+#ifndef HAVE_INT8_T
+#define HAVE_INT8_T
+#endif
+#ifndef HAVE_UINT8_T
+#define HAVE_UINT8_T
+#endif
+#ifndef HAVE_INT16_T
+#define HAVE_INT16_T
+#endif
+#ifndef HAVE_UINT16_T
+#define HAVE_UINT16_T
+#endif
+#ifndef HAVE_INT32_T
+#define HAVE_INT32_T
+#endif
+#ifndef HAVE_UINT32_T
+#define HAVE_UINT32_T
+#endif
+#ifndef HAVE_INT64_T
+#define HAVE_INT64_T
+#endif
+#ifndef HAVE_UINT64_T
+#define HAVE_UINT64_T
+#endif
+
 
 #ifndef _WIN64
 #ifndef _WIN32
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_portability.h?r1=1.4.2.9&r2=1.4.2.10&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_portability.h
diff -u php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.9 
php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.10
--- php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.9   Thu Nov  6 11:29:20 2008
+++ php-src/ext/mysqlnd/mysqlnd_portability.h   Thu Nov  6 14:21:50 2008
@@ -69,7 +69,6 @@
 #endif
 #endif
 
-
 #ifndef HAVE_UINT8_T
 #ifndef HAVE_UINT8
 typedef unsigned char uint8_t; /* Unsigned integer >= 8bits */
@@ -110,7 +109,6 @@
 #endif
 #endif /* HAVE_INT32_T */
 
-
 #ifndef HAVE_UINT32_T
 #ifdef HAVE_UINT32
 typedef uint32 uint32_t;
@@ -123,7 +121,6 @@
 #endif
 #endif /* HAVE_UINT32_T */
 
-
 #ifndef HAVE_INT64_T
 #ifdef HAVE_INT64
 typedef int64 int64_t;
@@ -142,7 +139,6 @@
 #endif
 #endif /* HAVE_INT64_T */
 
-
 #ifndef HAVE_UINT64_T
 #ifdef HAVE_UINT64
 typedef uint64 uint64_t;
@@ -179,7 +175,7 @@
 #endif
 
 
-#define int1store(T,A) do { *((zend_uchar*) (T)) = (A); } while(0)
+#define int1store(T,A) do { *((int8_t*) (T)) = (A); } while(0)
 #define uint1korr(A)   (*(((uint8_t*)(A
 
 /* Bit values are sent in reverted order of bytes, compared to normal !!! */



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

[PHP-CVS] cvs: php-src /ext/mysqlnd config-win.h mysqlnd_portability.h

2008-11-06 Thread Andrey Hristov

andrey  Thu Nov  6 14:20:19 2008 UTC

  Modified files:  
/php-src/ext/mysqlndconfig-win.h mysqlnd_portability.h 
  Log:
  Rely on win32/php_stdint.h on Windows for stdint types
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config-win.h?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqlnd/config-win.h
diff -u php-src/ext/mysqlnd/config-win.h:1.4 
php-src/ext/mysqlnd/config-win.h:1.5
--- php-src/ext/mysqlnd/config-win.h:1.4Thu Nov  6 11:26:07 2008
+++ php-src/ext/mysqlnd/config-win.hThu Nov  6 14:20:19 2008
@@ -10,6 +10,33 @@
 #include 
 #include 
 
+#include "win32/php_stdint.h"
+
+#ifndef HAVE_INT8_T
+#define HAVE_INT8_T
+#endif
+#ifndef HAVE_UINT8_T
+#define HAVE_UINT8_T
+#endif
+#ifndef HAVE_INT16_T
+#define HAVE_INT16_T
+#endif
+#ifndef HAVE_UINT16_T
+#define HAVE_UINT16_T
+#endif
+#ifndef HAVE_INT32_T
+#define HAVE_INT32_T
+#endif
+#ifndef HAVE_UINT32_T
+#define HAVE_UINT32_T
+#endif
+#ifndef HAVE_INT64_T
+#define HAVE_INT64_T
+#endif
+#ifndef HAVE_UINT64_T
+#define HAVE_UINT64_T
+#endif
+
 
 #ifndef _WIN64
 #ifndef _WIN32
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_portability.h?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_portability.h
diff -u php-src/ext/mysqlnd/mysqlnd_portability.h:1.12 
php-src/ext/mysqlnd/mysqlnd_portability.h:1.13
--- php-src/ext/mysqlnd/mysqlnd_portability.h:1.12  Thu Nov  6 10:36:30 2008
+++ php-src/ext/mysqlnd/mysqlnd_portability.h   Thu Nov  6 14:20:19 2008
@@ -60,7 +60,7 @@
 #endif
 
 /* Typdefs for easyier portability */
-
+#if 0
 #ifndef HAVE_INT8_T
 #ifndef HAVE_INT8
 typedef signed char int8_t;/* Signed integer >= 8bits 
*/
@@ -69,7 +69,6 @@
 #endif
 #endif
 
-
 #ifndef HAVE_UINT8_T
 #ifndef HAVE_UINT8
 typedef unsigned char uint8_t; /* Unsigned integer >= 8bits */
@@ -110,7 +109,6 @@
 #endif
 #endif /* HAVE_INT32_T */
 
-
 #ifndef HAVE_UINT32_T
 #ifdef HAVE_UINT32
 typedef uint32 uint32_t;
@@ -123,7 +121,6 @@
 #endif
 #endif /* HAVE_UINT32_T */
 
-
 #ifndef HAVE_INT64_T
 #ifdef HAVE_INT64
 typedef int64 int64_t;
@@ -142,7 +139,6 @@
 #endif
 #endif /* HAVE_INT64_T */
 
-
 #ifndef HAVE_UINT64_T
 #ifdef HAVE_UINT64
 typedef uint64 uint64_t;
@@ -161,6 +157,7 @@
 #endif
 #endif /* HAVE_INT64_T */
 
+#endif
 
 #ifdef PHP_WIN32
 #define MYSQLND_LLU_SPEC "%I64u"
@@ -179,7 +176,7 @@
 #endif
 
 
-#define int1store(T,A) do { *((zend_uchar*) (T)) = (A); } while(0)
+#define int1store(T,A) do { *((int8_t*) (T)) = (A); } while(0)
 #define uint1korr(A)   (*(((uint8_t*)(A
 
 /* Bit values are sent in reverted order of bytes, compared to normal !!! */
@@ -231,7 +228,7 @@
 **  (low byte first)
 */
 
-/* Optimized store functions for Intel x86, non-valid for WIN64 */
+/* Optimized store functions for Intel x86, non-valid for WIN64. __i386__ is 
GCC */
 #if defined(__i386__) && !defined(_WIN64)
 #define sint2korr(A)(*((int16_t *) (A)))
 #define sint3korr(A)((int32_t) uchar) (A)[2]) & 128) ? \



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

[PHP-CVS] cvs: php-src /win32 inet.h

2008-11-06 Thread Pierre-Alain Joye

pajoye  Thu Nov  6 14:16:14 2008 UTC

  Modified files:  
/php-src/win32  inet.h 
  Log:
  - MFH, has this feature before Vista/2k8 (use the same test in 5.3)
  
http://cvs.php.net/viewvc.cgi/php-src/win32/inet.h?r1=1.3&r2=1.4&diff_format=u
Index: php-src/win32/inet.h
diff -u php-src/win32/inet.h:1.3 php-src/win32/inet.h:1.4
--- php-src/win32/inet.h:1.3Sat Aug 23 20:31:26 2008
+++ php-src/win32/inet.hThu Nov  6 14:16:14 2008
@@ -4,7 +4,7 @@
 #endif
 #include 
 
-#if (_WIN32_WINNT < 0x0600) /* Vita/2k8 have these functions */
+#if (_WIN32_WINNT <= 0x500)
 PHPAPI int inet_pton(int af, const char* src, void* dst);
 PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size);
 PHPAPI int inet_aton(const char *cp, struct in_addr *inp);



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

[PHP-CVS] cvs: php-src /win32 php_stdint.h

2008-11-06 Thread Pierre-Alain Joye

pajoye  Thu Nov  6 14:15:20 2008 UTC

  Modified files:  
/php-src/win32  php_stdint.h 
  Log:
  - prevent warning when some types or macros are already defines (ICU defines 
many of them already)
  
http://cvs.php.net/viewvc.cgi/php-src/win32/php_stdint.h?r1=1.1&r2=1.2&diff_format=u
Index: php-src/win32/php_stdint.h
diff -u php-src/win32/php_stdint.h:1.1 php-src/win32/php_stdint.h:1.2
--- php-src/win32/php_stdint.h:1.1  Mon Jul 28 11:34:53 2008
+++ php-src/win32/php_stdint.h  Thu Nov  6 14:15:20 2008
@@ -116,19 +116,42 @@
 #if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 
220 at page 257 and footnote 221 at page 259
 
 // 7.18.2.1 Limits of exact-width integer types
-#define INT8_MIN ((int8_t)_I8_MIN)
-#define INT8_MAX _I8_MAX
-#define INT16_MIN((int16_t)_I16_MIN)
-#define INT16_MAX_I16_MAX
-#define INT32_MIN((int32_t)_I32_MIN)
-#define INT32_MAX_I32_MAX
-#define INT64_MIN((int64_t)_I64_MIN)
-#define INT64_MAX_I64_MAX
-#define UINT8_MAX_UI8_MAX
-#define UINT16_MAX   _UI16_MAX
-#define UINT32_MAX   _UI32_MAX
-#define UINT64_MAX   _UI64_MAX
-
+#ifndef INT8_MIN
+# define INT8_MIN ((int8_t)_I8_MIN)
+#endif
+#ifndef INT8_MAX
+# define INT8_MAX _I8_MAX
+#endif
+#ifndef INT16_MIN
+# define INT16_MIN((int16_t)_I16_MIN)
+#endif
+#ifndef INT16_MAX
+# define INT16_MAX_I16_MAX
+#endif
+#ifndef INT32_MIN
+# define INT32_MIN((int32_t)_I32_MIN)
+#endif
+#ifndef INT32_MAX
+# define INT32_MAX_I32_MAX
+#endif
+#ifndef INT64_MIN
+# define INT64_MIN((int64_t)_I64_MIN)
+#endif
+#ifndef INT64_MAX
+# define INT64_MAX_I64_MAX
+#endif
+#ifndef UINT8_MAX
+# define UINT8_MAX_UI8_MAX
+#endif
+#ifndef UINT16_MAX
+# define UINT16_MAX   _UI16_MAX
+#endif
+#ifndef UINT32_MAX
+# define UINT32_MAX   _UI32_MAX
+#endif
+#ifndef UINT64_MAX
+# define UINT64_MAX   _UI64_MAX
+#endif
 // 7.18.2.2 Limits of minimum-width integer types
 #define INT_LEAST8_MININT8_MIN
 #define INT_LEAST8_MAXINT8_MAX
@@ -217,13 +240,16 @@
 #define INT8_C(val)  val##i8
 #define INT16_C(val) val##i16
 #define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
+#ifndef INT64_C
+# define INT64_C(val) val##i64
+#endif
 
 #define UINT8_C(val)  val##ui8
 #define UINT16_C(val) val##ui16
 #define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
+#ifndef UINT64_C
+# define UINT64_C(val) val##ui64
+#endif
 // 7.18.4.2 Macros for greatest-width integer constants
 #define INTMAX_C   INT64_C
 #define UINTMAX_C  UINT64_C



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

[PHP-CVS] cvs: php-src /ext/fileinfo config.w32 fileinfo.c /ext/fileinfo/libmagic apprentice.c softmagic.c

2008-11-06 Thread Pierre-Alain Joye

pajoye  Thu Nov  6 13:56:49 2008 UTC

  Modified files:  
/php-src/ext/fileinfo   config.w32 fileinfo.c 
/php-src/ext/fileinfo/libmagic  apprentice.c softmagic.c 
  Log:
  - MFH
   - add 64bit typedef support
   - fix vc6 build (1/2)
   - still broken/does not build cleanly, more to come
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.w32?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/fileinfo/config.w32
diff -u php-src/ext/fileinfo/config.w32:1.3 php-src/ext/fileinfo/config.w32:1.4
--- php-src/ext/fileinfo/config.w32:1.3 Thu Jul 31 13:14:22 2008
+++ php-src/ext/fileinfo/config.w32 Thu Nov  6 13:56:48 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.3 2008/07/31 13:14:22 pajoye Exp $
+// $Id: config.w32,v 1.4 2008/11/06 13:56:48 pajoye Exp $
 // vim:ft=javascript
 
 ARG_ENABLE("fileinfo", "fileinfo support", "no");
@@ -13,6 +13,10 @@
magic.c print.c \
readelf.c softmagic.c";
 
+   if (VCVERS <1500) {
+   ADD_FLAG('CFLAGS', '/Zm1000');
+   }
+
EXTENSION('fileinfo', 'fileinfo.c', true, "/I" + 
configure_module_dirname + "/libmagic /I" + configure_module_dirname);
ADD_SOURCES(configure_module_dirname + '\\libmagic', 
LIBMAGIC_SOURCES, "fileinfo");
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.38&r2=1.39&diff_format=u
Index: php-src/ext/fileinfo/fileinfo.c
diff -u php-src/ext/fileinfo/fileinfo.c:1.38 
php-src/ext/fileinfo/fileinfo.c:1.39
--- php-src/ext/fileinfo/fileinfo.c:1.38Sun Nov  2 21:10:07 2008
+++ php-src/ext/fileinfo/fileinfo.c Thu Nov  6 13:56:48 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: fileinfo.c,v 1.38 2008/11/02 21:10:07 felipe Exp $ */
+/* $Id: fileinfo.c,v 1.39 2008/11/06 13:56:48 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -324,7 +324,7 @@
RETURN_FALSE;
}
 
-   if (file && *file) { /* user specified filed, perform open_basedir 
checks */
+   if (file && *file) { /* user specified file, perform open_basedir 
checks */
if (!VCWD_REALPATH(file, resolved_path)) {
RETURN_FALSE;
}
@@ -533,9 +533,6 @@
php_stream *stream = 
php_stream_open_wrapper_ex(buffer, "rb", REPORT_ERRORS, NULL, context);
 
if (!stream) {
-   if (mimetype_emu) {
-   magic_close(magic);
-   }
RETVAL_FALSE;
goto clean;
}
@@ -545,6 +542,7 @@
}
break;
}
+
default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can only 
process string or stream arguments");
}
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/apprentice.c?r1=1.17&r2=1.18&diff_format=u
Index: php-src/ext/fileinfo/libmagic/apprentice.c
diff -u php-src/ext/fileinfo/libmagic/apprentice.c:1.17 
php-src/ext/fileinfo/libmagic/apprentice.c:1.18
--- php-src/ext/fileinfo/libmagic/apprentice.c:1.17 Sun Nov  2 16:09:26 2008
+++ php-src/ext/fileinfo/libmagic/apprentice.c  Thu Nov  6 13:56:49 2008
@@ -584,7 +584,7 @@
 load_1(struct magic_set *ms, int action, const char *fn, int *errs,
struct magic_entry **marray, uint32_t *marraycount)
 {
-   zstr buffer;
+   char buffer[BUFSIZ + 1];
char *line;
size_t line_len;
size_t lineno = 0;
@@ -598,13 +598,14 @@
 #else
stream = php_stream_open_wrapper((char *)fn, "rb", REPORT_ERRORS, NULL);
 #endif
+
if (stream == NULL) {
if (errno != ENOENT)
file_error(ms, errno, "cannot read magic file `%s'",
   fn);
(*errs)++;
} else {
-   buffer.v = emalloc(BUFSIZ+1);
+
/* read and parse this file */
for (ms->line = 1; (line = php_stream_get_line(stream, buffer , 
BUFSIZ, &line_len)) != NULL; ms->line++) {
if (line_len == 0) /* null line, garbage, etc */
@@ -652,7 +653,7 @@
if (parse(ms, marray, marraycount, line, lineno, 
action) != 0)
(*errs)++;
}
-   efree(buffer.v);
+
php_stream_close(stream);
}
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/softmagic.c?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/fileinfo/libmagic/softmagic.c
diff -u php-src/ext/fileinfo/libmagic/softmagic.c:1.9 
php-src/ext/fileinfo/libmagic/softmagic.c:1.10
--- php-src/ext/fileinfo/libmagic/softmagic.c:1.9   Thu Nov  6 02:58:14 2008
+++

[PHP-CVS] cvs: php-src /win32 php5ts_cli.rc2

2008-11-06 Thread Pierre-Alain Joye

pajoye  Thu Nov  6 13:31:59 2008 UTC

  Modified files:  
/php-src/win32  php5ts_cli.rc2 
  Log:
  - revert previous commit (borked editor)
  
http://cvs.php.net/viewvc.cgi/php-src/win32/php5ts_cli.rc2?r1=1.4&r2=1.5&diff_format=u
Index: php-src/win32/php5ts_cli.rc2
diff -u php-src/win32/php5ts_cli.rc2:1.4 php-src/win32/php5ts_cli.rc2:1.5
--- php-src/win32/php5ts_cli.rc2:1.4Thu Nov  6 13:12:27 2008
+++ php-src/win32/php5ts_cli.rc2Thu Nov  6 13:31:59 2008
@@ -1,122 +1,61 @@
-//
-
-// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
-
-//
-
-
-
-#ifdef APSTUDIO_INVOKED
-
-   #error this file is not editable by Microsoft Visual C++
-
-#endif //APSTUDIO_INVOKED
-
-
-
-
-
-/
-
-// Add manually edited resources here...
-
-#include "../main/php_version.h"
-
-
-
-#define XSTRVER4(maj, min, rel, build) #maj "." #min "." #rel "." #build
-
-#define XSTRVER3(maj, min, rel) #maj "." #min "." #rel
-
-#define STRVER4(maj, min, rel, build) XSTRVER4(maj, min, rel, build)
-
-#define STRVER3(maj, min, rel) XSTRVER3(maj, min, rel)
-
-
-
-#ifndef _MAC
-
-//Version
-
-VS_VERSION_INFO VERSIONINFO
-
- FILEVERSION 
PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,PHP_RELEASE_VERSION
-
- PRODUCTVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0
-
- FILEFLAGSMASK 0x3fL
-
-#ifdef _DEBUG
-
- FILEFLAGS VS_FF_DEBUG
-
-#else
-
- FILEFLAGS 0x0L
-
-#endif
-
- FILEOS VOS__WINDOWS32
-
- FILETYPE VFT_APP
-
- FILESUBTYPE VFT2_UNKNOWN
-
-BEGIN
-
-BLOCK "StringFileInfo"
-
-BEGIN
-
-BLOCK "040904b0"
-
-BEGIN
-
-VALUE "Comments", "\0"
-
-VALUE "CompanyName", "The PHP Group\0"
-
-VALUE "FileDescription", "PHP Script Interpreter\0"
-
-VALUE "FileVersion", STRVER4(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, 
PHP_RELEASE_VERSION, PHP_RELEASE_VERSION)
-
-VALUE "InternalName", "php-cli\0"
-
-VALUE "LegalCopyright", "Copyright © 1997-2008 The PHP Group\0"
-
-VALUE "LegalTrademarks", "php\0"
-
-VALUE "OriginalFilename", "php.exe\0"
-
-VALUE "PrivateBuild", "\0"
-
-VALUE "ProductName", "PHP Thread Safe Command Line Interface\0"
-
-VALUE "ProductVersion", STRVER3(PHP_MAJOR_VERSION, 
PHP_MINOR_VERSION, PHP_RELEASE_VERSION)
-
-VALUE "SpecialBuild", PHP_EXTRA_VERSION "\0"
-
-   VALUE "URL", "http://www.php.net";
-
-END
-
-END
-
-BLOCK "VarFileInfo"
-
-BEGIN
-
-VALUE "Translation", 0x409, 1200
-
-END
-
-END
-
-
-
-#endif// !_MAC
-
-
-
-/
-
+//
+// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
+//
+
+#ifdef APSTUDIO_INVOKED
+   #error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+
+/
+// Add manually edited resources here...
+#include "../main/php_version.h"
+
+#define XSTRVER4(maj, min, rel, build) #maj "." #min "." #rel "." #build
+#define XSTRVER3(maj, min, rel) #maj "." #min "." #rel
+#define STRVER4(maj, min, rel, build) XSTRVER4(maj, min, rel, build)
+#define STRVER3(maj, min, rel) XSTRVER3(maj, min, rel)
+
+#ifndef _MAC
+//Version
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 
PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,PHP_RELEASE_VERSION
+ PRODUCTVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+BLOCK "StringFileInfo"
+BEGIN
+BLOCK "040904b0"
+BEGIN
+VALUE "Comments", "\0"
+VALUE "CompanyName", "The PHP Group\0"
+VALUE "FileDescription", "PHP Script Interpreter\0"
+VALUE "FileVersion", STRVER4(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, 
PHP_RELEASE_VERSION, PHP_RELEASE_VERSION)
+VALUE "InternalName", "php-cli\0"
+VALUE "LegalCopyright", "Copyright © 1997-2006 The PHP Group\0"
+VALUE "LegalTrademarks", "php\0"
+VALUE "OriginalFilename", "php.exe\0"
+VALUE "PrivateBuild", "\0"
+VALUE "ProductName", "PHP Thread Safe Command Line Interface\0"
+VALUE "ProductVersion", STRVER3(PHP_MAJOR_VERSION, 
PHP_MINOR_VERSION, PHP_RELEASE_VERSION)
+VALUE "SpecialBuild", PHP_EXTRA_VERSION "\0"
+   VALUE "URL", "http://www.php.net";
+END
+END
+BLOCK "VarFileInfo"
+BEGIN
+VALUE "Translation", 0x409, 1200
+END
+END
+
+#endif// !_MAC
+
+/



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

[PHP-CVS] cvs: php-src(PHP_5_3) /win32 php5ts_cli.rc2

2008-11-06 Thread Pierre-Alain Joye

pajoye  Thu Nov  6 13:30:18 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32  php5ts_cli.rc2 
  Log:
  - revert previous commit (borked editor)
  
http://cvs.php.net/viewvc.cgi/php-src/win32/php5ts_cli.rc2?r1=1.2.2.1.2.1.2.1&r2=1.2.2.1.2.1.2.2&diff_format=u
Index: php-src/win32/php5ts_cli.rc2
diff -u php-src/win32/php5ts_cli.rc2:1.2.2.1.2.1.2.1 
php-src/win32/php5ts_cli.rc2:1.2.2.1.2.1.2.2
--- php-src/win32/php5ts_cli.rc2:1.2.2.1.2.1.2.1Thu Nov  6 13:11:56 2008
+++ php-src/win32/php5ts_cli.rc2Thu Nov  6 13:30:18 2008
@@ -1,122 +1,61 @@
-//
-
-// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
-
-//
-
-
-
-#ifdef APSTUDIO_INVOKED
-
-   #error this file is not editable by Microsoft Visual C++
-
-#endif //APSTUDIO_INVOKED
-
-
-
-
-
-/
-
-// Add manually edited resources here...
-
-#include "../main/php_version.h"
-
-
-
-#define XSTRVER4(maj, min, rel, build) #maj "." #min "." #rel "." #build
-
-#define XSTRVER3(maj, min, rel) #maj "." #min "." #rel
-
-#define STRVER4(maj, min, rel, build) XSTRVER4(maj, min, rel, build)
-
-#define STRVER3(maj, min, rel) XSTRVER3(maj, min, rel)
-
-
-
-#ifndef _MAC
-
-//Version
-
-VS_VERSION_INFO VERSIONINFO
-
- FILEVERSION 
PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,PHP_RELEASE_VERSION
-
- PRODUCTVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0
-
- FILEFLAGSMASK 0x3fL
-
-#ifdef _DEBUG
-
- FILEFLAGS VS_FF_DEBUG
-
-#else
-
- FILEFLAGS 0x0L
-
-#endif
-
- FILEOS VOS__WINDOWS32
-
- FILETYPE VFT_APP
-
- FILESUBTYPE VFT2_UNKNOWN
-
-BEGIN
-
-BLOCK "StringFileInfo"
-
-BEGIN
-
-BLOCK "040904b0"
-
-BEGIN
-
-VALUE "Comments", "\0"
-
-VALUE "CompanyName", "The PHP Group\0"
-
-VALUE "FileDescription", "PHP Script Interpreter\0"
-
-VALUE "FileVersion", STRVER4(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, 
PHP_RELEASE_VERSION, PHP_RELEASE_VERSION)
-
-VALUE "InternalName", "php-cli\0"
-
-VALUE "LegalCopyright", "Copyright © 1997-2008 The PHP Group\0"
-
-VALUE "LegalTrademarks", "php\0"
-
-VALUE "OriginalFilename", "php.exe\0"
-
-VALUE "PrivateBuild", "\0"
-
-VALUE "ProductName", "PHP Thread Safe Command Line Interface\0"
-
-VALUE "ProductVersion", STRVER3(PHP_MAJOR_VERSION, 
PHP_MINOR_VERSION, PHP_RELEASE_VERSION)
-
-VALUE "SpecialBuild", PHP_EXTRA_VERSION "\0"
-
-   VALUE "URL", "http://www.php.net";
-
-END
-
-END
-
-BLOCK "VarFileInfo"
-
-BEGIN
-
-VALUE "Translation", 0x409, 1200
-
-END
-
-END
-
-
-
-#endif// !_MAC
-
-
-
-/
-
+//
+// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
+//
+
+#ifdef APSTUDIO_INVOKED
+   #error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+
+/
+// Add manually edited resources here...
+#include "../main/php_version.h"
+
+#define XSTRVER4(maj, min, rel, build) #maj "." #min "." #rel "." #build
+#define XSTRVER3(maj, min, rel) #maj "." #min "." #rel
+#define STRVER4(maj, min, rel, build) XSTRVER4(maj, min, rel, build)
+#define STRVER3(maj, min, rel) XSTRVER3(maj, min, rel)
+
+#ifndef _MAC
+//Version
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 
PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,PHP_RELEASE_VERSION
+ PRODUCTVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+BLOCK "StringFileInfo"
+BEGIN
+BLOCK "040904b0"
+BEGIN
+VALUE "Comments", "\0"
+VALUE "CompanyName", "The PHP Group\0"
+VALUE "FileDescription", "PHP Script Interpreter\0"
+VALUE "FileVersion", STRVER4(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, 
PHP_RELEASE_VERSION, PHP_RELEASE_VERSION)
+VALUE "InternalName", "php-cli\0"
+VALUE "LegalCopyright", "Copyright © 1997-2006 The PHP Group\0"
+VALUE "LegalTrademarks", "php\0"
+VALUE "OriginalFilename", "php.exe\0"
+VALUE "PrivateBuild", "\0"
+VALUE "ProductName", "PHP Thread Safe Command Line Interface\0"
+VALUE "ProductVersion", STRVER3(PHP_MAJOR_VERSION, 
PHP_MINOR_VERSION, PHP_RELEASE_VERSION)
+VALUE "SpecialBuild", PHP_EXTRA_VERSION "\0"
+   VALUE "URL", "http://www.php.net";
+END
+END
+BLOCK "VarFileInfo"
+BEGIN
+VALUE "Translation", 0x409, 1200
+END
+END
+
+#endif// !_MAC
+
+//

[PHP-CVS] cvs: php-src /win32 php5ts_cli.rc2

2008-11-06 Thread Pierre-Alain Joye

pajoye  Thu Nov  6 13:12:27 2008 UTC

  Modified files:  
/php-src/win32  php5ts_cli.rc2 
  Log:
  - MFB: bump year
  
http://cvs.php.net/viewvc.cgi/php-src/win32/php5ts_cli.rc2?r1=1.3&r2=1.4&diff_format=u
Index: php-src/win32/php5ts_cli.rc2
diff -u php-src/win32/php5ts_cli.rc2:1.3 php-src/win32/php5ts_cli.rc2:1.4
--- php-src/win32/php5ts_cli.rc2:1.3Sun Jan  1 13:09:59 2006
+++ php-src/win32/php5ts_cli.rc2Thu Nov  6 13:12:27 2008
@@ -1,61 +1,122 @@
-//
-// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
-//
-
-#ifdef APSTUDIO_INVOKED
-   #error this file is not editable by Microsoft Visual C++
-#endif //APSTUDIO_INVOKED
-
-
-/
-// Add manually edited resources here...
-#include "../main/php_version.h"
-
-#define XSTRVER4(maj, min, rel, build) #maj "." #min "." #rel "." #build
-#define XSTRVER3(maj, min, rel) #maj "." #min "." #rel
-#define STRVER4(maj, min, rel, build) XSTRVER4(maj, min, rel, build)
-#define STRVER3(maj, min, rel) XSTRVER3(maj, min, rel)
-
-#ifndef _MAC
-//Version
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 
PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,PHP_RELEASE_VERSION
- PRODUCTVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_APP
- FILESUBTYPE VFT2_UNKNOWN
-BEGIN
-BLOCK "StringFileInfo"
-BEGIN
-BLOCK "040904b0"
-BEGIN
-VALUE "Comments", "\0"
-VALUE "CompanyName", "The PHP Group\0"
-VALUE "FileDescription", "PHP Script Interpreter\0"
-VALUE "FileVersion", STRVER4(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, 
PHP_RELEASE_VERSION, PHP_RELEASE_VERSION)
-VALUE "InternalName", "php-cli\0"
-VALUE "LegalCopyright", "Copyright © 1997-2006 The PHP Group\0"
-VALUE "LegalTrademarks", "php\0"
-VALUE "OriginalFilename", "php.exe\0"
-VALUE "PrivateBuild", "\0"
-VALUE "ProductName", "PHP Thread Safe Command Line Interface\0"
-VALUE "ProductVersion", STRVER3(PHP_MAJOR_VERSION, 
PHP_MINOR_VERSION, PHP_RELEASE_VERSION)
-VALUE "SpecialBuild", PHP_EXTRA_VERSION "\0"
-   VALUE "URL", "http://www.php.net";
-END
-END
-BLOCK "VarFileInfo"
-BEGIN
-VALUE "Translation", 0x409, 1200
-END
-END
-
-#endif// !_MAC
-
-/
+//
+
+// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
+
+//
+
+
+
+#ifdef APSTUDIO_INVOKED
+
+   #error this file is not editable by Microsoft Visual C++
+
+#endif //APSTUDIO_INVOKED
+
+
+
+
+
+/
+
+// Add manually edited resources here...
+
+#include "../main/php_version.h"
+
+
+
+#define XSTRVER4(maj, min, rel, build) #maj "." #min "." #rel "." #build
+
+#define XSTRVER3(maj, min, rel) #maj "." #min "." #rel
+
+#define STRVER4(maj, min, rel, build) XSTRVER4(maj, min, rel, build)
+
+#define STRVER3(maj, min, rel) XSTRVER3(maj, min, rel)
+
+
+
+#ifndef _MAC
+
+//Version
+
+VS_VERSION_INFO VERSIONINFO
+
+ FILEVERSION 
PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,PHP_RELEASE_VERSION
+
+ PRODUCTVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0
+
+ FILEFLAGSMASK 0x3fL
+
+#ifdef _DEBUG
+
+ FILEFLAGS VS_FF_DEBUG
+
+#else
+
+ FILEFLAGS 0x0L
+
+#endif
+
+ FILEOS VOS__WINDOWS32
+
+ FILETYPE VFT_APP
+
+ FILESUBTYPE VFT2_UNKNOWN
+
+BEGIN
+
+BLOCK "StringFileInfo"
+
+BEGIN
+
+BLOCK "040904b0"
+
+BEGIN
+
+VALUE "Comments", "\0"
+
+VALUE "CompanyName", "The PHP Group\0"
+
+VALUE "FileDescription", "PHP Script Interpreter\0"
+
+VALUE "FileVersion", STRVER4(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, 
PHP_RELEASE_VERSION, PHP_RELEASE_VERSION)
+
+VALUE "InternalName", "php-cli\0"
+
+VALUE "LegalCopyright", "Copyright © 1997-2008 The PHP Group\0"
+
+VALUE "LegalTrademarks", "php\0"
+
+VALUE "OriginalFilename", "php.exe\0"
+
+VALUE "PrivateBuild", "\0"
+
+VALUE "ProductName", "PHP Thread Safe Command Line Interface\0"
+
+VALUE "ProductVersion", STRVER3(PHP_MAJOR_VERSION, 
PHP_MINOR_VERSION, PHP_RELEASE_VERSION)
+
+VALUE "SpecialBuild", PHP_EXTRA_VERSION "\0"
+
+   VALUE "URL", "http://www.php.net";
+
+END
+
+END
+
+BLOCK "VarFileInfo"
+
+BEGIN
+
+VALUE "Translation", 0x409, 1200
+
+END
+
+END
+
+
+
+#endif// !_MAC
+
+
+
+/
+



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

[PHP-CVS] cvs: php-src(PHP_5_3) /win32 php5ts_cli.rc2

2008-11-06 Thread Pierre-Alain Joye

pajoye  Thu Nov  6 13:11:56 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32  php5ts_cli.rc2 
  Log:
  - bump year
  
http://cvs.php.net/viewvc.cgi/php-src/win32/php5ts_cli.rc2?r1=1.2.2.1.2.1&r2=1.2.2.1.2.1.2.1&diff_format=u
Index: php-src/win32/php5ts_cli.rc2
diff -u php-src/win32/php5ts_cli.rc2:1.2.2.1.2.1 
php-src/win32/php5ts_cli.rc2:1.2.2.1.2.1.2.1
--- php-src/win32/php5ts_cli.rc2:1.2.2.1.2.1Mon Jan  1 19:32:09 2007
+++ php-src/win32/php5ts_cli.rc2Thu Nov  6 13:11:56 2008
@@ -1,61 +1,122 @@
-//
-// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
-//
-
-#ifdef APSTUDIO_INVOKED
-   #error this file is not editable by Microsoft Visual C++
-#endif //APSTUDIO_INVOKED
-
-
-/
-// Add manually edited resources here...
-#include "../main/php_version.h"
-
-#define XSTRVER4(maj, min, rel, build) #maj "." #min "." #rel "." #build
-#define XSTRVER3(maj, min, rel) #maj "." #min "." #rel
-#define STRVER4(maj, min, rel, build) XSTRVER4(maj, min, rel, build)
-#define STRVER3(maj, min, rel) XSTRVER3(maj, min, rel)
-
-#ifndef _MAC
-//Version
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 
PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,PHP_RELEASE_VERSION
- PRODUCTVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_APP
- FILESUBTYPE VFT2_UNKNOWN
-BEGIN
-BLOCK "StringFileInfo"
-BEGIN
-BLOCK "040904b0"
-BEGIN
-VALUE "Comments", "\0"
-VALUE "CompanyName", "The PHP Group\0"
-VALUE "FileDescription", "PHP Script Interpreter\0"
-VALUE "FileVersion", STRVER4(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, 
PHP_RELEASE_VERSION, PHP_RELEASE_VERSION)
-VALUE "InternalName", "php-cli\0"
-VALUE "LegalCopyright", "Copyright © 1997-2007 The PHP Group\0"
-VALUE "LegalTrademarks", "php\0"
-VALUE "OriginalFilename", "php.exe\0"
-VALUE "PrivateBuild", "\0"
-VALUE "ProductName", "PHP Thread Safe Command Line Interface\0"
-VALUE "ProductVersion", STRVER3(PHP_MAJOR_VERSION, 
PHP_MINOR_VERSION, PHP_RELEASE_VERSION)
-VALUE "SpecialBuild", PHP_EXTRA_VERSION "\0"
-   VALUE "URL", "http://www.php.net";
-END
-END
-BLOCK "VarFileInfo"
-BEGIN
-VALUE "Translation", 0x409, 1200
-END
-END
-
-#endif// !_MAC
-
-/
+//
+
+// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
+
+//
+
+
+
+#ifdef APSTUDIO_INVOKED
+
+   #error this file is not editable by Microsoft Visual C++
+
+#endif //APSTUDIO_INVOKED
+
+
+
+
+
+/
+
+// Add manually edited resources here...
+
+#include "../main/php_version.h"
+
+
+
+#define XSTRVER4(maj, min, rel, build) #maj "." #min "." #rel "." #build
+
+#define XSTRVER3(maj, min, rel) #maj "." #min "." #rel
+
+#define STRVER4(maj, min, rel, build) XSTRVER4(maj, min, rel, build)
+
+#define STRVER3(maj, min, rel) XSTRVER3(maj, min, rel)
+
+
+
+#ifndef _MAC
+
+//Version
+
+VS_VERSION_INFO VERSIONINFO
+
+ FILEVERSION 
PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,PHP_RELEASE_VERSION
+
+ PRODUCTVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0
+
+ FILEFLAGSMASK 0x3fL
+
+#ifdef _DEBUG
+
+ FILEFLAGS VS_FF_DEBUG
+
+#else
+
+ FILEFLAGS 0x0L
+
+#endif
+
+ FILEOS VOS__WINDOWS32
+
+ FILETYPE VFT_APP
+
+ FILESUBTYPE VFT2_UNKNOWN
+
+BEGIN
+
+BLOCK "StringFileInfo"
+
+BEGIN
+
+BLOCK "040904b0"
+
+BEGIN
+
+VALUE "Comments", "\0"
+
+VALUE "CompanyName", "The PHP Group\0"
+
+VALUE "FileDescription", "PHP Script Interpreter\0"
+
+VALUE "FileVersion", STRVER4(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, 
PHP_RELEASE_VERSION, PHP_RELEASE_VERSION)
+
+VALUE "InternalName", "php-cli\0"
+
+VALUE "LegalCopyright", "Copyright © 1997-2008 The PHP Group\0"
+
+VALUE "LegalTrademarks", "php\0"
+
+VALUE "OriginalFilename", "php.exe\0"
+
+VALUE "PrivateBuild", "\0"
+
+VALUE "ProductName", "PHP Thread Safe Command Line Interface\0"
+
+VALUE "ProductVersion", STRVER3(PHP_MAJOR_VERSION, 
PHP_MINOR_VERSION, PHP_RELEASE_VERSION)
+
+VALUE "SpecialBuild", PHP_EXTRA_VERSION "\0"
+
+   VALUE "URL", "http://www.php.net";
+
+END
+
+END
+
+BLOCK "VarFileInfo"
+
+BEGIN
+
+VALUE "Translation", 0x409, 1200
+
+END
+
+END
+
+
+
+#endif// !_MAC
+
+
+
+/
+



-- 
PHP CVS Mailing List (http://w

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd config-win.h mysqlnd_portability.h

2008-11-06 Thread Andrey Hristov

andrey  Thu Nov  6 11:29:20 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndconfig-win.h mysqlnd_portability.h 
  Log:
  MFH: More cleanup of config-win.h
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config-win.h?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/mysqlnd/config-win.h
diff -u php-src/ext/mysqlnd/config-win.h:1.1.2.4 
php-src/ext/mysqlnd/config-win.h:1.1.2.5
--- php-src/ext/mysqlnd/config-win.h:1.1.2.4Thu Nov  6 10:37:47 2008
+++ php-src/ext/mysqlnd/config-win.hThu Nov  6 11:29:20 2008
@@ -10,13 +10,6 @@
 #include 
 #include 
 
-#if defined(__NT__)
-#defineSYSTEM_TYPE "NT"
-#elif defined(__WIN2000__)
-#defineSYSTEM_TYPE "WIN2000"
-#else
-#defineSYSTEM_TYPE "Win95/Win98"
-#endif
 
 #ifndef _WIN64
 #ifndef _WIN32
@@ -27,21 +20,11 @@
 #endif
 #endif /* _WIN64 */
 #ifndef __WIN__
-#define __WIN__   /* To make it easier in VC++ */
+#define __WIN__/* To make it easier in VC++ */
 #endif
 
-#define LONGLONG_MIN   ((__int64) 0x8000)
-#define LONGLONG_MAX   ((__int64) 0x7FFF)
-#define LL(A)  ((__int64) A)
-
 /* Type information */
 
-/*
-typedef unsigned intuint;
-*/
-typedef int sigset_t;
-#define longlong_defined
-
 #define SIZEOF_CHAR1
 #define SIZEOF_LONG4
 #define SIZEOF_LONG_LONG   8
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_portability.h?r1=1.4.2.8&r2=1.4.2.9&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_portability.h
diff -u php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.8 
php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.9
--- php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.8   Thu Nov  6 10:37:47 2008
+++ php-src/ext/mysqlnd/mysqlnd_portability.h   Thu Nov  6 11:29:20 2008
@@ -231,7 +231,7 @@
 **  (low byte first)
 */
 
-/* Optimized store functions for Intel x86, non-valid for WIN64 */
+/* Optimized store functions for Intel x86, non-valid for WIN64. __i386__ is 
GCC */
 #if defined(__i386__) && !defined(_WIN64)
 #define sint2korr(A)(*((int16_t *) (A)))
 #define sint3korr(A)((int32_t) uchar) (A)[2]) & 128) ? \



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

[PHP-CVS] cvs: php-src /ext/mysqlnd config-win.h mysqlnd_ps.c

2008-11-06 Thread Andrey Hristov

andrey  Thu Nov  6 11:26:07 2008 UTC

  Modified files:  
/php-src/ext/mysqlndconfig-win.h mysqlnd_ps.c 
  Log:
  More cleanup of config-win.h and missed merge, which actually occured in 5_3
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config-win.h?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqlnd/config-win.h
diff -u php-src/ext/mysqlnd/config-win.h:1.3 
php-src/ext/mysqlnd/config-win.h:1.4
--- php-src/ext/mysqlnd/config-win.h:1.3Thu Nov  6 10:36:30 2008
+++ php-src/ext/mysqlnd/config-win.hThu Nov  6 11:26:07 2008
@@ -10,13 +10,6 @@
 #include 
 #include 
 
-#if defined(__NT__)
-#defineSYSTEM_TYPE "NT"
-#elif defined(__WIN2000__)
-#defineSYSTEM_TYPE "WIN2000"
-#else
-#defineSYSTEM_TYPE "Win95/Win98"
-#endif
 
 #ifndef _WIN64
 #ifndef _WIN32
@@ -27,21 +20,11 @@
 #endif
 #endif /* _WIN64 */
 #ifndef __WIN__
-#define __WIN__   /* To make it easier in VC++ */
+#define __WIN__/* To make it easier in VC++ */
 #endif
 
-#define LONGLONG_MIN   ((__int64) 0x8000)
-#define LONGLONG_MAX   ((__int64) 0x7FFF)
-#define LL(A)  ((__int64) A)
-
 /* Type information */
 
-/*
-typedef unsigned intuint;
-*/
-typedef int sigset_t;
-#define longlong_defined
-
 #define SIZEOF_CHAR1
 #define SIZEOF_LONG4
 #define SIZEOF_LONG_LONG   8
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_ps.c?r1=1.23&r2=1.24&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_ps.c
diff -u php-src/ext/mysqlnd/mysqlnd_ps.c:1.23 
php-src/ext/mysqlnd/mysqlnd_ps.c:1.24
--- php-src/ext/mysqlnd/mysqlnd_ps.c:1.23   Fri Oct 31 20:30:33 2008
+++ php-src/ext/mysqlnd/mysqlnd_ps.cThu Nov  6 11:26:07 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysqlnd_ps.c,v 1.23 2008/10/31 20:30:33 andrey Exp $ */
+/* $Id: mysqlnd_ps.c,v 1.24 2008/11/06 11:26:07 andrey Exp $ */
 #include "php.h"
 #include "mysqlnd.h"
 #include "mysqlnd_wireprotocol.h"
@@ -58,7 +58,7 @@

   zend_bool *fetched_anything TSRMLS_DC);
 
 static void mysqlnd_stmt_separate_result_bind(MYSQLND_STMT * const stmt 
TSRMLS_DC);
-static void mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const stmt, 
uint param_no TSRMLS_DC);
+static void mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const stmt, 
unsigned int param_no TSRMLS_DC);
 
 static void mysqlnd_internal_free_stmt_content(MYSQLND_STMT * const stmt 
TSRMLS_DC);
 static enum_func_status mysqlnd_stmt_execute_parse_response(MYSQLND_STMT * 
const stmt TSRMLS_DC);
@@ -653,7 +653,7 @@
}
 
if (stmt->param_count) {
-   uint i, not_bound = 0;
+   unsigned int i, not_bound = 0;
if (!stmt->param_bind) {
SET_STMT_ERROR(stmt, CR_PARAMS_NOT_BOUND, 
UNKNOWN_SQLSTATE,
 "No data supplied for 
parameters in prepared statement");
@@ -708,7 +708,7 @@
 {
MYSQLND_STMT *stmt = (MYSQLND_STMT *) param;
MYSQLND_RES_BUFFERED *set = result->stored_data;
-   uint field_count = result->meta->field_count;
+   unsigned int field_count = result->meta->field_count;
 
DBG_ENTER("mysqlnd_fetch_stmt_row_buffered");
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
@@ -1477,7 +1477,7 @@
SET_EMPTY_ERROR(stmt->conn->error_info);
 
if (stmt->field_count) {
-   uint i = 0;
+   unsigned int i = 0;
 
if (!result_bind) {
DBG_ERR("no result bind passed");
@@ -1508,7 +1508,7 @@
 
 /* {{{ mysqlnd_stmt::bind_result */
 static enum_func_status
-MYSQLND_METHOD(mysqlnd_stmt, bind_one_result)(MYSQLND_STMT * const stmt, uint 
param_no TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_stmt, bind_one_result)(MYSQLND_STMT * const stmt, 
unsigned int param_no TSRMLS_DC)
 {
DBG_ENTER("mysqlnd_stmt::bind_result");
DBG_INF_FMT("stmt=%lu field_count=%u", stmt->stmt_id, 
stmt->field_count);
@@ -1887,7 +1887,7 @@
 
 
 /* {{{ mysqlnd_stmt_separate_one_result_bind */
-void mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const stmt, uint 
param_no TSRMLS_DC)
+void mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const stmt, unsigned 
int param_no TSRMLS_DC)
 {
DBG_ENTER("mysqlnd_stmt_separate_one_result_bind");
DBG_INF_FMT("stmt=%lu result_bind=%p field_count=%u param_no=%d",



-- 
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/pdo_mysql config.m4

2008-11-06 Thread Johannes Schlüter

johannesThu Nov  6 11:12:21 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdo_mysql  config.m4 
  Log:
  MFH: Don't enable mysqlnd when pdo_mysql is being built with libmysql
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/config.m4?r1=1.25.2.7.2.6.2.4&r2=1.25.2.7.2.6.2.5&diff_format=u
Index: php-src/ext/pdo_mysql/config.m4
diff -u php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.6.2.4 
php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.6.2.5
--- php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.6.2.4Sat Jul 26 23:38:14 2008
+++ php-src/ext/pdo_mysql/config.m4 Thu Nov  6 11:12:21 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.25.2.7.2.6.2.4 2008/07/26 23:38:14 jani Exp $
+dnl $Id: config.m4,v 1.25.2.7.2.6.2.5 2008/11/06 11:12:21 johannes Exp $
 dnl config.m4 for extension pdo_mysql
 dnl vim: se ts=2 sw=2 et:
 
@@ -18,8 +18,6 @@
 AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure 
line.])
   fi
 
-  PHP_MYSQLND_ENABLED=yes
-
   AC_DEFUN([PDO_MYSQL_LIB_CHK], [
 str="$PDO_MYSQL_DIR/$1/libmysqlclient*"
 for j in `echo $str`; do
@@ -32,7 +30,7 @@
 
   if test "$PHP_PDO_MYSQL" = "mysqlnd"; then
 dnl enables build of mysqnd library
-PHP_MYSQL_ENABLED=yes
+PHP_MYSQLND_ENABLED=yes
 AC_DEFINE([PDO_USE_MYSQLND], 1, [Whether pdo_mysql uses mysqlnd])
   else
 AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])



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

[PHP-CVS] cvs: php-src /ext/pdo_mysql config.m4

2008-11-06 Thread Johannes Schlüter

johannesThu Nov  6 11:11:57 2008 UTC

  Modified files:  
/php-src/ext/pdo_mysql  config.m4 
  Log:
  Don't enable mysqlnd when pdo_mysql is being built with libmysql
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/config.m4?r1=1.29&r2=1.30&diff_format=u
Index: php-src/ext/pdo_mysql/config.m4
diff -u php-src/ext/pdo_mysql/config.m4:1.29 
php-src/ext/pdo_mysql/config.m4:1.30
--- php-src/ext/pdo_mysql/config.m4:1.29Fri Jul 25 13:38:40 2008
+++ php-src/ext/pdo_mysql/config.m4 Thu Nov  6 11:11:57 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.29 2008/07/25 13:38:40 jani Exp $
+dnl $Id: config.m4,v 1.30 2008/11/06 11:11:57 johannes Exp $
 dnl config.m4 for extension pdo_mysql
 dnl vim: se ts=2 sw=2 et:
 
@@ -19,8 +19,6 @@
 AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure 
line.])
   fi
 
-  PHP_MYSQLND_ENABLED=yes
-
   AC_DEFUN([PDO_MYSQL_LIB_CHK], [
 str="$PDO_MYSQL_DIR/$1/libmysqlclient*"
 for j in `echo $str`; do
@@ -33,7 +31,7 @@
 
   if test "$PHP_PDO_MYSQL" = "mysqlnd"; then
 dnl enables build of mysqnd library
-PHP_MYSQL_ENABLED=yes
+PHP_MYSQLND_ENABLED=yes
 AC_DEFINE([PDO_USE_MYSQLND], 1, [Whether pdo_mysql uses mysqlnd])
   else
 AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])



-- 
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/mysqlnd config-win.h mysqlnd.c mysqlnd.h mysqlnd_block_alloc.c mysqlnd_charset.c mysqlnd_debug.c mysqlnd_debug.h mysqlnd_loaddata.c mysqlnd_portability.h mysqlnd_p

2008-11-06 Thread Andrey Hristov

andrey  Thu Nov  6 10:37:48 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndconfig-win.h mysqlnd.c mysqlnd.h 
mysqlnd_block_alloc.c mysqlnd_charset.c 
mysqlnd_debug.c mysqlnd_debug.h 
mysqlnd_loaddata.c mysqlnd_portability.h 
mysqlnd_priv.h mysqlnd_ps.c mysqlnd_ps_codec.c 
mysqlnd_result.c mysqlnd_structs.h 
mysqlnd_wireprotocol.c mysqlnd_wireprotocol.h 
  Log:
  MFH:
  Get rid of many defines (which simplifies the code a lot),
  as well as uint->unsigned int
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config-win.h?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/mysqlnd/config-win.h
diff -u php-src/ext/mysqlnd/config-win.h:1.1.2.3 
php-src/ext/mysqlnd/config-win.h:1.1.2.4
--- php-src/ext/mysqlnd/config-win.h:1.1.2.3Sat Nov  1 21:22:29 2008
+++ php-src/ext/mysqlnd/config-win.hThu Nov  6 10:37:47 2008
@@ -18,10 +18,7 @@
 #defineSYSTEM_TYPE "Win95/Win98"
 #endif
 
-#ifdef _WIN64
-#define MACHINE_TYPE   "ia64"  /* Define to machine type name */
-#else
-#define MACHINE_TYPE   "i32"   /* Define to machine type name */
+#ifndef _WIN64
 #ifndef _WIN32
 #define _WIN32 /* Compatible with old source */
 #endif
@@ -40,10 +37,7 @@
 /* Type information */
 
 /*
-typedef unsigned short  ushort;
 typedef unsigned intuint;
-typedef unsigned __int64 ulonglong;
-typedef __int64longlong;
 */
 typedef int sigset_t;
 #define longlong_defined
@@ -58,43 +52,40 @@
 
 #define sint2korr(A)   (*((int16_t *) (A)))
 #define sint3korr(A)   ((int32_t) uchar) (A)[2]) & 128) ? \
- (((uint32_t) 255L << 24) | \
-  (((uint32_t) (uchar) (A)[2]) << 16) |\
-  (((uint32_t) (uchar) (A)[1]) << 8) | \
-  ((uint32_t) (uchar) (A)[0])) : \
- (((uint32_t) (uchar) (A)[2]) << 16) |\
- (((uint32_t) (uchar) (A)[1]) << 8) | \
- ((uint32_t) (uchar) (A)[0])))
+   
(((uint32_t) 255L << 24) | \
+   
(((uint32_t) (uchar) (A)[2]) << 16) |\
+   
(((uint32_t) (uchar) (A)[1]) << 8) | \
+   
((uint32_t) (uchar) (A)[0])) : \
+   
(((uint32_t) (uchar) (A)[2]) << 16) |\
+   
(((uint32_t) (uchar) (A)[1]) << 8) | \
+   
((uint32_t) (uchar) (A)[0])))
 #define sint4korr(A)   (*((int32_t *) (A)))
 #define uint2korr(A)   (*((uint16_t *) (A)))
 #define uint3korr(A)   (int32_t) (*((uint32_t *) (A)) & 0xFF)
 #define uint4korr(A)   (*((uint32_t *) (A)))
 #define uint5korr(A)   ((uint64_t)(((uint32_t) ((uchar) (A)[0])) +\
-   (((uint32_t) ((uchar) (A)[1])) << 8) +\
-   (((uint32_t) ((uchar) (A)[2])) << 16) +\
-   (((uint32_t) ((uchar) (A)[3])) << 24)) +\
-   (((uint64_t) ((uchar) (A)[4])) << 32))
+   
(((uint32_t) ((uchar) (A)[1])) << 8) +\
+   
(((uint32_t) ((uchar) (A)[2])) << 16) +\
+   
(((uint32_t) ((uchar) (A)[3])) << 24)) +\
+   
(((uint64_t) ((uchar) (A)[4])) << 32))
 #define uint8korr(A)   (*((uint64_t *) (A)))
 #define sint8korr(A)   (*((int64_t *) (A)))
 #define int2store(T,A) *((uint16_t*) (T))= (uint16_t) (A)
-#define int3store(T,A) { *(T)=  (uchar) ((A));\
- *(T+1)=(uchar) (((uint32_t) (A) >> 8));\
- *(T+2)=(uchar) (((A) >> 16)); }
+#define int3store(T,A) {   *(T)=  (uchar) ((A));\
+   *(T+1)=(uchar) 
(((uint32_t) (A) >> 8));\
+   *(T+2)=(uchar) 
(((A) >> 16)); }
 #define int4store(T,A) *((int32_t *) (T))= (int32_t) (A)
-#define int5store(T,A) { *(T)= (uchar)((A));\
- *((T)+1)=(uchar) (((A) >> 8));\
- *((T)+2)=(uchar) (((A) >> 16));\
-

[PHP-CVS] cvs: php-src /ext/mysqlnd config-win.h mysqlnd.c mysqlnd.h mysqlnd_block_alloc.c mysqlnd_charset.c mysqlnd_debug.c mysqlnd_debug.h mysqlnd_loaddata.c mysqlnd_portability.h mysqlnd_priv.h mys

2008-11-06 Thread Andrey Hristov

andrey  Thu Nov  6 10:36:30 2008 UTC

  Modified files:  
/php-src/ext/mysqlndconfig-win.h mysqlnd.c mysqlnd.h 
mysqlnd_block_alloc.c mysqlnd_charset.c 
mysqlnd_debug.c mysqlnd_debug.h 
mysqlnd_loaddata.c mysqlnd_portability.h 
mysqlnd_priv.h mysqlnd_ps_codec.c 
mysqlnd_result.c mysqlnd_structs.h 
mysqlnd_wireprotocol.c mysqlnd_wireprotocol.h 
  Log:
  Get rid of many defines (which simplifies the code a lot),
  as well as uint->unsigned int
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config-win.h?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqlnd/config-win.h
diff -u php-src/ext/mysqlnd/config-win.h:1.2 
php-src/ext/mysqlnd/config-win.h:1.3
--- php-src/ext/mysqlnd/config-win.h:1.2Mon Nov  3 18:07:40 2008
+++ php-src/ext/mysqlnd/config-win.hThu Nov  6 10:36:30 2008
@@ -18,10 +18,7 @@
 #defineSYSTEM_TYPE "Win95/Win98"
 #endif
 
-#ifdef _WIN64
-#define MACHINE_TYPE   "ia64"  /* Define to machine type name */
-#else
-#define MACHINE_TYPE   "i32"   /* Define to machine type name */
+#ifndef _WIN64
 #ifndef _WIN32
 #define _WIN32 /* Compatible with old source */
 #endif
@@ -40,10 +37,7 @@
 /* Type information */
 
 /*
-typedef unsigned short  ushort;
 typedef unsigned intuint;
-typedef unsigned __int64 ulonglong;
-typedef __int64longlong;
 */
 typedef int sigset_t;
 #define longlong_defined
@@ -58,43 +52,40 @@
 
 #define sint2korr(A)   (*((int16_t *) (A)))
 #define sint3korr(A)   ((int32_t) uchar) (A)[2]) & 128) ? \
- (((uint32_t) 255L << 24) | \
-  (((uint32_t) (uchar) (A)[2]) << 16) |\
-  (((uint32_t) (uchar) (A)[1]) << 8) | \
-  ((uint32_t) (uchar) (A)[0])) : \
- (((uint32_t) (uchar) (A)[2]) << 16) |\
- (((uint32_t) (uchar) (A)[1]) << 8) | \
- ((uint32_t) (uchar) (A)[0])))
+   
(((uint32_t) 255L << 24) | \
+   
(((uint32_t) (uchar) (A)[2]) << 16) |\
+   
(((uint32_t) (uchar) (A)[1]) << 8) | \
+   
((uint32_t) (uchar) (A)[0])) : \
+   
(((uint32_t) (uchar) (A)[2]) << 16) |\
+   
(((uint32_t) (uchar) (A)[1]) << 8) | \
+   
((uint32_t) (uchar) (A)[0])))
 #define sint4korr(A)   (*((int32_t *) (A)))
 #define uint2korr(A)   (*((uint16_t *) (A)))
 #define uint3korr(A)   (int32_t) (*((uint32_t *) (A)) & 0xFF)
 #define uint4korr(A)   (*((uint32_t *) (A)))
 #define uint5korr(A)   ((uint64_t)(((uint32_t) ((uchar) (A)[0])) +\
-   (((uint32_t) ((uchar) (A)[1])) << 8) +\
-   (((uint32_t) ((uchar) (A)[2])) << 16) +\
-   (((uint32_t) ((uchar) (A)[3])) << 24)) +\
-   (((uint64_t) ((uchar) (A)[4])) << 32))
+   
(((uint32_t) ((uchar) (A)[1])) << 8) +\
+   
(((uint32_t) ((uchar) (A)[2])) << 16) +\
+   
(((uint32_t) ((uchar) (A)[3])) << 24)) +\
+   
(((uint64_t) ((uchar) (A)[4])) << 32))
 #define uint8korr(A)   (*((uint64_t *) (A)))
 #define sint8korr(A)   (*((int64_t *) (A)))
 #define int2store(T,A) *((uint16_t*) (T))= (uint16_t) (A)
-#define int3store(T,A) { *(T)=  (uchar) ((A));\
- *(T+1)=(uchar) (((uint32_t) (A) >> 8));\
- *(T+2)=(uchar) (((A) >> 16)); }
+#define int3store(T,A) {   *(T)=  (uchar) ((A));\
+   *(T+1)=(uchar) 
(((uint32_t) (A) >> 8));\
+   *(T+2)=(uchar) 
(((A) >> 16)); }
 #define int4store(T,A) *((int32_t *) (T))= (int32_t) (A)
-#define int5store(T,A) { *(T)= (uchar)((A));\
- *((T)+1)=(uchar) (((A) >> 8));\
- *((T)+2)=(uchar) (((A) >> 16));\
- *((T)+3)=(uchar) (((A) >> 24)); \
-

[PHP-CVS] cvs: php-src /ext/gd gd.c /ext/gd/libgd gd.h gd_jpeg.c gd_png.c

2008-11-06 Thread Pierre-Alain Joye

pajoye  Thu Nov  6 10:23:52 2008 UTC

  Modified files:  
/php-src/ext/gd gd.c 
/php-src/ext/gd/libgd   gd.h gd_jpeg.c gd_png.c 
  Log:
  - MFH: 
   - Fix linux build (static)
   - add gd[Format]Version[Int|String] first methods to work around the png
 header issues
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.398&r2=1.399&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.398 php-src/ext/gd/gd.c:1.399
--- php-src/ext/gd/gd.c:1.398   Tue Nov  4 20:24:46 2008
+++ php-src/ext/gd/gd.c Thu Nov  6 10:23:52 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.398 2008/11/04 20:24:46 pajoye Exp $ */
+/* $Id: gd.c,v 1.399 2008/11/06 10:23:52 pajoye Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -29,11 +29,6 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_GD_PNG
-/* needs to be first */
-#include 
-#endif
-
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/head.h"
@@ -60,6 +55,15 @@
 
 #if HAVE_LIBGD
 
+#ifdef HAVE_GD_PNG
+/* needs to be first */
+# include 
+#endif
+
+#ifdef HAVE_GD_JPG
+# include 
+#endif
+
 static int le_gd, le_gd_font;
 #if HAVE_LIBT1
 #include 
@@ -1328,15 +1332,15 @@
 #endif
 #ifdef HAVE_GD_JPG
{
-   char tmp[256];
-   snprintf(tmp, sizeof(tmp), "%d", JPEG_LIB_VERSION);
+   char tmp[12];
+   snprintf(tmp, sizeof(tmp), "%d", gdJpegGetVersionInt());
php_info_print_table_row(2, "JPG Support", "enabled");
php_info_print_table_row(2, "libJPEG Version", tmp);
}
 #endif
 #ifdef HAVE_GD_PNG
php_info_print_table_row(2, "PNG Support", "enabled");
-   php_info_print_table_row(2, "libPNG Version", PNG_LIBPNG_VER_STRING);
+   php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString());
 #endif
php_info_print_table_row(2, "WBMP Support", "enabled");
 #if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.h?r1=1.34&r2=1.35&diff_format=u
Index: php-src/ext/gd/libgd/gd.h
diff -u php-src/ext/gd/libgd/gd.h:1.34 php-src/ext/gd/libgd/gd.h:1.35
--- php-src/ext/gd/libgd/gd.h:1.34  Tue Sep 11 21:31:14 2007
+++ php-src/ext/gd/libgd/gd.h   Thu Nov  6 10:23:52 2008
@@ -246,6 +246,9 @@
 gdImagePtr gdImageCreateFromJpeg(FILE *infile, int ignore_warning);
 gdImagePtr gdImageCreateFromJpegCtx(gdIOCtx *infile, int ignore_warning);
 
+int gdJpegGetVersionInt();
+const char * gdPngGetVersionString();
+
 /* A custom data source. */
 /* The source function must return -1 on error, otherwise the number
 of bytes fetched. 0 is EOF, not an error! */
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_jpeg.c?r1=1.21&r2=1.22&diff_format=u
Index: php-src/ext/gd/libgd/gd_jpeg.c
diff -u php-src/ext/gd/libgd/gd_jpeg.c:1.21 php-src/ext/gd/libgd/gd_jpeg.c:1.22
--- php-src/ext/gd/libgd/gd_jpeg.c:1.21 Sat Feb  4 14:56:58 2006
+++ php-src/ext/gd/libgd/gd_jpeg.c  Thu Nov  6 10:23:52 2008
@@ -102,6 +102,11 @@
exit (99);
 }
 
+int gdJpegGetVersionInt()
+{
+   return JPEG_LIB_VERSION;
+}
+
 /*
  * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality
  * QUALITY.  If QUALITY is in the range 0-100, increasing values
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_png.c?r1=1.25&r2=1.26&diff_format=u
Index: php-src/ext/gd/libgd/gd_png.c
diff -u php-src/ext/gd/libgd/gd_png.c:1.25 php-src/ext/gd/libgd/gd_png.c:1.26
--- php-src/ext/gd/libgd/gd_png.c:1.25  Thu Jul 31 09:23:59 2008
+++ php-src/ext/gd/libgd/gd_png.c   Thu Nov  6 10:23:52 2008
@@ -36,6 +36,11 @@
 
   ---*/
 
+const char * gdPngGetVersionString()
+{
+   return PNG_LIBPNG_VER_STRING;
+}
+
 #ifndef PNG_SETJMP_NOT_SUPPORTED
 typedef struct _jmpbuf_wrapper
 {



-- 
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/gd gd.c

2008-11-06 Thread Pierre-Alain Joye

pajoye  Thu Nov  6 10:17:44 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/gd gd.c 
  Log:
  - typo
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.23&r2=1.312.2.20.2.32.2.24&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.23 
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.24
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.23Thu Nov  6 10:14:37 2008
+++ php-src/ext/gd/gd.c Thu Nov  6 10:17:44 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.312.2.20.2.32.2.23 2008/11/06 10:14:37 pajoye Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.24 2008/11/06 10:17:44 pajoye Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1389,7 +1389,7 @@
char tmp[12];
snprintf(tmp, sizeof(tmp), "%d", gdJpegGetVersionInt());
php_info_print_table_row(2, "JPG Support", "enabled");
-   php_info_print_table_row(2, "libPNG Version", tmp);
+   php_info_print_table_row(2, "libJPEG Version", tmp);
}
 #endif
 



-- 
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/gd gd.c /ext/gd/libgd gd.h gd_jpeg.c gd_png.c

2008-11-06 Thread Pierre-Alain Joye

pajoye  Thu Nov  6 10:14:38 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/gd gd.c 
/php-src/ext/gd/libgd   gd.h gd_jpeg.c gd_png.c 
  Log:
  - fix build on linux (static)
  - add gd[Format]Version[Int|String] first methods to work around the png
header issues
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.22&r2=1.312.2.20.2.32.2.23&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.22 
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.23
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.22Tue Nov  4 20:25:45 2008
+++ php-src/ext/gd/gd.c Thu Nov  6 10:14:37 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.312.2.20.2.32.2.22 2008/11/04 20:25:45 pajoye Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.23 2008/11/06 10:14:37 pajoye Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -29,15 +29,6 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_GD_PNG
-/* needs to be first */
-#include 
-#endif
-#ifdef HAVE_GD_JPG
-/* needs to be first */
-#include 
-#endif
-
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/head.h"
@@ -1395,15 +1386,16 @@
 #endif
 #ifdef HAVE_GD_JPG
{
-   char tmp[256];
-   snprintf(tmp, sizeof(tmp), "%d", JPEG_LIB_VERSION);
+   char tmp[12];
+   snprintf(tmp, sizeof(tmp), "%d", gdJpegGetVersionInt());
php_info_print_table_row(2, "JPG Support", "enabled");
-   php_info_print_table_row(2, "libJPEG Version", tmp);
+   php_info_print_table_row(2, "libPNG Version", tmp);
}
 #endif
+
 #ifdef HAVE_GD_PNG
php_info_print_table_row(2, "PNG Support", "enabled");
-   php_info_print_table_row(2, "libPNG Version", PNG_LIBPNG_VER_STRING);
+   php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString());
 #endif
 #ifdef HAVE_GD_WBMP
php_info_print_table_row(2, "WBMP Support", "enabled");
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.h?r1=1.26.2.3.2.6&r2=1.26.2.3.2.6.2.1&diff_format=u
Index: php-src/ext/gd/libgd/gd.h
diff -u php-src/ext/gd/libgd/gd.h:1.26.2.3.2.6 
php-src/ext/gd/libgd/gd.h:1.26.2.3.2.6.2.1
--- php-src/ext/gd/libgd/gd.h:1.26.2.3.2.6  Tue Sep 11 23:34:25 2007
+++ php-src/ext/gd/libgd/gd.h   Thu Nov  6 10:14:37 2008
@@ -250,6 +250,8 @@
 gdImagePtr gdImageCreateFromJpeg(FILE *infile, int ignore_warning);
 gdImagePtr gdImageCreateFromJpegCtx(gdIOCtx *infile, int ignore_warning);
 
+int gdJpegGetVersionInt();
+const char * gdPngGetVersionString();
 /* A custom data source. */
 /* The source function must return -1 on error, otherwise the number
 of bytes fetched. 0 is EOF, not an error! */
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_jpeg.c?r1=1.18.4.2&r2=1.18.4.2.4.1&diff_format=u
Index: php-src/ext/gd/libgd/gd_jpeg.c
diff -u php-src/ext/gd/libgd/gd_jpeg.c:1.18.4.2 
php-src/ext/gd/libgd/gd_jpeg.c:1.18.4.2.4.1
--- php-src/ext/gd/libgd/gd_jpeg.c:1.18.4.2 Sun Feb  5 15:53:58 2006
+++ php-src/ext/gd/libgd/gd_jpeg.c  Thu Nov  6 10:14:37 2008
@@ -102,6 +102,11 @@
exit (99);
 }
 
+int gdJpegGetVersionInt()
+{
+   return JPEG_LIB_VERSION;
+}
+
 /*
  * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality
  * QUALITY.  If QUALITY is in the range 0-100, increasing values
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_png.c?r1=1.17.4.2.2.5.2.1&r2=1.17.4.2.2.5.2.2&diff_format=u
Index: php-src/ext/gd/libgd/gd_png.c
diff -u php-src/ext/gd/libgd/gd_png.c:1.17.4.2.2.5.2.1 
php-src/ext/gd/libgd/gd_png.c:1.17.4.2.2.5.2.2
--- php-src/ext/gd/libgd/gd_png.c:1.17.4.2.2.5.2.1  Thu Jul 31 09:23:18 2008
+++ php-src/ext/gd/libgd/gd_png.c   Thu Nov  6 10:14:37 2008
@@ -36,6 +36,11 @@
 
   ---*/
 
+const char * gdPngGetVersionString()
+{
+   return PNG_LIBPNG_VER_STRING;
+}
+
 #ifndef PNG_SETJMP_NOT_SUPPORTED
 typedef struct _jmpbuf_wrapper
 {



-- 
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/date php_date.c php_date.h /ext/date/lib parse_date.c

2008-11-06 Thread Derick Rethans

derick  Thu Nov  6 09:46:36 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/date   php_date.c php_date.h 
/php-src/ext/date/lib   parse_date.c 
  Log:
  - MFH: Export DateTime and DateTimeZone class entries so that external
extensions can make use of it as well.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.57&r2=1.43.2.45.2.51.2.58&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.57 
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.58
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.57 Sun Nov  2 21:19:30 2008
+++ php-src/ext/date/php_date.c Thu Nov  6 09:45:58 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.57 2008/11/02 21:19:30 felipe Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.58 2008/11/06 09:45:58 derick Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -556,55 +556,22 @@
 
 zend_class_entry *date_ce_date, *date_ce_timezone, *date_ce_interval, 
*date_ce_period;
 
+
+PHPAPI zend_class_entry *php_date_get_date_ce(void)
+{
+   return date_ce_date;
+}
+
+PHPAPI zend_class_entry *php_date_get_timezone_ce(void)
+{
+   return date_ce_timezone;
+}
+
 static zend_object_handlers date_object_handlers_date;
 static zend_object_handlers date_object_handlers_timezone;
 static zend_object_handlers date_object_handlers_interval;
 static zend_object_handlers date_object_handlers_period;
 
-typedef struct _php_date_obj php_date_obj;
-typedef struct _php_timezone_obj php_timezone_obj;
-typedef struct _php_interval_obj php_interval_obj;
-typedef struct _php_period_obj php_period_obj;
-
-struct _php_date_obj {
-   zend_object   std;
-   timelib_time *time;
-   HashTable*props;
-};
-
-struct _php_timezone_obj {
-   zend_object std;
-   int initialized;
-   int type;
-   union {
-   timelib_tzinfo *tz; /* TIMELIB_ZONETYPE_ID; */
-   timelib_sll utc_offset; /* TIMELIB_ZONETYPE_OFFSET */
-   struct  /* TIMELIB_ZONETYPE_ABBR */
-   {
-   timelib_sll  utc_offset;
-   char*abbr;
-   int  dst;
-   } z;
-   } tzi;
-};
-
-struct _php_interval_obj {
-   zend_object   std;
-   timelib_rel_time *diff;
-   HashTable*props;
-   int   initialized;
-};
-
-struct _php_period_obj {
-   zend_object   std;
-   timelib_time *start;
-   timelib_time *end;
-   timelib_rel_time *interval;
-   int   recurrences;
-   int   initialized;
-   int   include_start_date;
-};
-
 #define DATE_SET_CONTEXT \
zval *object; \
object = getThis(); \
@@ -2609,7 +2576,7 @@
 /* }}} */
 
 /* Helper function used to add an associative array of warnings and errors to 
a zval */
-void zval_from_error_container(zval *z, timelib_error_container *error)
+static void zval_from_error_container(zval *z, timelib_error_container *error)
 {
int   i;
zval *element;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.h?r1=1.17.2.11.2.3.2.9&r2=1.17.2.11.2.3.2.10&diff_format=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.17.2.11.2.3.2.9 
php-src/ext/date/php_date.h:1.17.2.11.2.3.2.10
--- php-src/ext/date/php_date.h:1.17.2.11.2.3.2.9   Fri Jul 18 14:33:53 2008
+++ php-src/ext/date/php_date.h Thu Nov  6 09:45:58 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_date.h,v 1.17.2.11.2.3.2.9 2008/07/18 14:33:53 derick Exp $ */
+/* $Id: php_date.h,v 1.17.2.11.2.3.2.10 2008/11/06 09:45:58 derick Exp $ */
 
 #ifndef PHP_DATE_H
 #define PHP_DATE_H
@@ -101,6 +101,50 @@
 PHP_MSHUTDOWN_FUNCTION(date);
 PHP_MINFO_FUNCTION(date);
 
+typedef struct _php_date_obj php_date_obj;
+typedef struct _php_timezone_obj php_timezone_obj;
+typedef struct _php_interval_obj php_interval_obj;
+typedef struct _php_period_obj php_period_obj;
+
+struct _php_date_obj {
+   zend_object   std;
+   timelib_time *time;
+   HashTable*props;
+};
+
+struct _php_timezone_obj {
+   zend_object std;
+   int initialized;
+   int type;
+   union {
+   timelib_tzinfo *tz; /* TIMELIB_ZONETYPE_ID; */
+   timelib_sll utc_offset; /* TIMELIB_ZONETYPE_OFFSET */
+   struct  /* TIMELIB_ZONETYPE_ABBR */
+   {
+   timelib_sll  utc_offset;
+   char*abbr;
+   int  dst;
+   } z;
+   } tzi;
+};
+
+struct _php_interval_obj {
+   zend_object   std;
+   timelib_rel_time *diff;
+   HashTa

[PHP-CVS] cvs: php-src /ext/date php_date.c php_date.h

2008-11-06 Thread Derick Rethans

derick  Thu Nov  6 09:44:03 2008 UTC

  Modified files:  
/php-src/ext/date   php_date.c php_date.h 
  Log:
  - Export DateTime and DateTimeZone class entries so that external extensions
can make use of it as well.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.209&r2=1.210&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.209 php-src/ext/date/php_date.c:1.210
--- php-src/ext/date/php_date.c:1.209   Sun Nov  2 21:10:07 2008
+++ php-src/ext/date/php_date.c Thu Nov  6 09:44:03 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.209 2008/11/02 21:10:07 felipe Exp $ */
+/* $Id: php_date.c,v 1.210 2008/11/06 09:44:03 derick Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -564,55 +564,22 @@
 
 zend_class_entry *date_ce_date, *date_ce_timezone, *date_ce_interval, 
*date_ce_period;
 
+
+PHPAPI zend_class_entry *php_date_get_date_ce(void)
+{
+   return date_ce_date;
+}
+
+PHPAPI zend_class_entry *php_date_get_timezone_ce(void)
+{
+   return date_ce_timezone;
+}
+
 static zend_object_handlers date_object_handlers_date;
 static zend_object_handlers date_object_handlers_timezone;
 static zend_object_handlers date_object_handlers_interval;
 static zend_object_handlers date_object_handlers_period;
 
-typedef struct _php_date_obj php_date_obj;
-typedef struct _php_timezone_obj php_timezone_obj;
-typedef struct _php_interval_obj php_interval_obj;
-typedef struct _php_period_obj php_period_obj;
-
-struct _php_date_obj {
-   zend_object   std;
-   timelib_time *time;
-   HashTable*props;
-};
-
-struct _php_timezone_obj {
-   zend_object std;
-   int initialized;
-   int type;
-   union {
-   timelib_tzinfo *tz; /* TIMELIB_ZONETYPE_ID; */
-   timelib_sll utc_offset; /* TIMELIB_ZONETYPE_OFFSET */
-   struct  /* TIMELIB_ZONETYPE_ABBR */
-   {
-   timelib_sll  utc_offset;
-   char*abbr;
-   int  dst;
-   } z;
-   } tzi;
-};
-
-struct _php_interval_obj {
-   zend_object   std;
-   timelib_rel_time *diff;
-   HashTable*props;
-   int   initialized;
-};
-
-struct _php_period_obj {
-   zend_object   std;
-   timelib_time *start;
-   timelib_time *end;
-   timelib_rel_time *interval;
-   int   recurrences;
-   int   initialized;
-   int   include_start_date;
-};
-
 #define DATE_SET_CONTEXT \
zval *object; \
object = getThis(); \
@@ -2746,7 +2713,7 @@
 /* }}} */
 
 /* Helper function used to add an associative array of warnings and errors to 
a zval */
-void zval_from_error_container(zval *z, timelib_error_container *error)
+static void zval_from_error_container(zval *z, timelib_error_container *error)
 {
int   i;
zval *element;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.h?r1=1.41&r2=1.42&diff_format=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.41 php-src/ext/date/php_date.h:1.42
--- php-src/ext/date/php_date.h:1.41Fri Jul 18 14:33:27 2008
+++ php-src/ext/date/php_date.h Thu Nov  6 09:44:03 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_date.h,v 1.41 2008/07/18 14:33:27 derick Exp $ */
+/* $Id: php_date.h,v 1.42 2008/11/06 09:44:03 derick Exp $ */
 
 #ifndef PHP_DATE_H
 #define PHP_DATE_H
@@ -105,6 +105,50 @@
 PHP_MSHUTDOWN_FUNCTION(date);
 PHP_MINFO_FUNCTION(date);
 
+typedef struct _php_date_obj php_date_obj;
+typedef struct _php_timezone_obj php_timezone_obj;
+typedef struct _php_interval_obj php_interval_obj;
+typedef struct _php_period_obj php_period_obj;
+
+struct _php_date_obj {
+   zend_object   std;
+   timelib_time *time;
+   HashTable*props;
+};
+
+struct _php_timezone_obj {
+   zend_object std;
+   int initialized;
+   int type;
+   union {
+   timelib_tzinfo *tz; /* TIMELIB_ZONETYPE_ID; */
+   timelib_sll utc_offset; /* TIMELIB_ZONETYPE_OFFSET */
+   struct  /* TIMELIB_ZONETYPE_ABBR */
+   {
+   timelib_sll  utc_offset;
+   char*abbr;
+   int  dst;
+   } z;
+   } tzi;
+};
+
+struct _php_interval_obj {
+   zend_object   std;
+   timelib_rel_time *diff;
+   HashTable*props;
+   int   initialized;
+};
+
+struct _php_period_obj {
+   zend_object   std;
+   timelib_time *start;
+   timelib_time *end;
+   timelib_rel_time *interval;
+   int   recurrences;
+

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php

2008-11-06 Thread Jani Taskinen


PLEASE keep the run-test.php in sync in PHP_5_2 also..

--Jani


Scott MacVicar wrote:

scottmacThu Nov  6 03:09:41 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src	run-tests.php 
  Log:

  MFH: Support versions of valgrind from SVN. The version is shown as 3.4.0.SVN
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.51&r2=1.226.2.37.2.35.2.52&diff_format=u

Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.51 
php-src/run-tests.php:1.226.2.37.2.35.2.52
--- php-src/run-tests.php:1.226.2.37.2.35.2.51  Mon Nov  3 13:07:28 2008
+++ php-src/run-tests.php   Thu Nov  6 03:09:41 2008
@@ -24,7 +24,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.51 2008/11/03 13:07:28 felipe Exp $ */

+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.52 2008/11/06 03:09:41 scottmac Exp 
$ */
 
 /* Sanity check to ensure that pcre extension needed by this script is available.

  * In the event it is not, print a nice error message indicating that this 
script will
@@ -543,7 +543,7 @@
if (!$valgrind_header) {
error("Valgrind returned no version 
info, cannot proceed.\nPlease check if Valgrind is installed.");
} else {
-   $valgrind_version = 
preg_replace("/valgrind-([0-9])\.([0-9])\.([0-9]+)(-\w+)?(\s+)/", '$1$2$3', 
$valgrind_header, 1, $replace_count);
+   $valgrind_version = 
preg_replace("/valgrind-([0-9])\.([0-9])\.([0-9]+)([.-]\w+)?(\s+)/", '$1$2$3', 
$valgrind_header, 1, $replace_count);
if ($replace_count != 1 || 
!is_numeric($valgrind_version)) {
error("Valgrind returned invalid 
version info (\"$valgrind_header\"), cannot proceed.");
}
@@ -612,7 +612,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.226.2.37.2.35.2.51 $' . 
"\n";
+   echo '$Revision: 1.226.2.37.2.35.2.52 $' . 
"\n";
exit(1);
 
 default:







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

39 matches

Mail list logo