[PHP-CVS] svn: /php/php-src/trunk/main/ main.c

[Pierre Joye]

pajoye   Thu, 20 Jan 2011 12:23:30 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=307624

Log:
- should not have been applied

Changed paths:
U   php/php-src/trunk/main/main.c

Modified: php/php-src/trunk/main/main.c
===
--- php/php-src/trunk/main/main.c   2011-01-20 11:22:00 UTC (rev 307623)
+++ php/php-src/trunk/main/main.c   2011-01-20 12:23:30 UTC (rev 307624)
@@ -1864,13 +1864,7 @@
 #endif
GetModuleFileName((HINSTANCE)__ImageBase, module_path, MAX_PATH);
php_dirname(module_path, strlen(module_path));
-   {
-   char dll_dir[MAX_PATH];
-   sprintf(dll_dir, %s\\%s, module_path, ..\\..\\deps\\bin);
-   SetDllDirectory(dll_dir);
-   }
-// GetModuleFileName (NULL, module_path, MAX_PATH);
-//__debugbreak();
+
 #ifdef ZTS
tsrm_ls = ts_resource(0);
 #endif

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

[PHP-CVS] svn: /php/php-src/trunk/main/ main.c

[Felipe Pena]

felipe   Thu, 20 Jan 2011 12:32:41 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=307625

Log:
- Removed accidental changes

Changed paths:
U   php/php-src/trunk/main/main.c

Modified: php/php-src/trunk/main/main.c
===
--- php/php-src/trunk/main/main.c   2011-01-20 12:23:30 UTC (rev 307624)
+++ php/php-src/trunk/main/main.c   2011-01-20 12:32:41 UTC (rev 307625)
@@ -1823,7 +1823,6 @@
}
 }
 #endif
-EXTERN_C IMAGE_DOS_HEADER __ImageBase;

 /* {{{ php_module_startup
  */
@@ -1862,8 +1861,6 @@
 #else
php_os=PHP_OS;
 #endif
-   GetModuleFileName((HINSTANCE)__ImageBase, module_path, MAX_PATH);
-   php_dirname(module_path, strlen(module_path));

 #ifdef ZTS
tsrm_ls = ts_resource(0);

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/com_dotnet/ com_olechar.c

[Pierre Joye]

pajoye   Thu, 20 Jan 2011 13:57:40 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=307626

Log:
- this function is only in trunk

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/com_dotnet/com_olechar.c

Modified: php/php-src/branches/PHP_5_3/ext/com_dotnet/com_olechar.c
===
--- php/php-src/branches/PHP_5_3/ext/com_dotnet/com_olechar.c   2011-01-20 
12:32:41 UTC (rev 307625)
+++ php/php-src/branches/PHP_5_3/ext/com_dotnet/com_olechar.c   2011-01-20 
13:57:40 UTC (rev 307626)
@@ -85,7 +85,7 @@
}

if (!ok) {
-   char *msg = php_win32_error_to_msg(GetLastError());
+   char *msg = php_win_err(GetLastError());

php_error_docref(NULL TSRMLS_CC, E_WARNING,
Could not convert string from unicode: `%s', msg);

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/phar/zip.c trunk/ext/phar/zip.c

[Ilia Alshanetsky]

iliaaThu, 20 Jan 2011 19:32:36 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=307637

Log:
Fixed variable overloading

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/phar/zip.c
U   php/php-src/trunk/ext/phar/zip.c

Modified: php/php-src/branches/PHP_5_3/ext/phar/zip.c
===
--- php/php-src/branches/PHP_5_3/ext/phar/zip.c 2011-01-20 19:25:10 UTC (rev 
307636)
+++ php/php-src/branches/PHP_5_3/ext/phar/zip.c 2011-01-20 19:32:36 UTC (rev 
307637)
@@ -1434,9 +1434,9 @@
php_stream_seek(pass.centralfp, 0, SEEK_SET);

{
-   size_t len;
-   int ret = phar_stream_copy_to_stream(pass.centralfp, 
pass.filefp, PHP_STREAM_COPY_ALL, len);
-   if (SUCCESS != ret || len != cdir_size) {
+   size_t clen;
+   int ret = phar_stream_copy_to_stream(pass.centralfp, 
pass.filefp, PHP_STREAM_COPY_ALL, clen);
+   if (SUCCESS != ret || clen != cdir_size) {
if (error) {
spprintf(error, 4096, phar zip flush of \%s\ 
failed: unable to write central-directory, phar-fname);
}

Modified: php/php-src/trunk/ext/phar/zip.c
===
--- php/php-src/trunk/ext/phar/zip.c2011-01-20 19:25:10 UTC (rev 307636)
+++ php/php-src/trunk/ext/phar/zip.c2011-01-20 19:32:36 UTC (rev 307637)
@@ -1434,9 +1434,9 @@
php_stream_seek(pass.centralfp, 0, SEEK_SET);

{
-   size_t len;
-   int ret = phar_stream_copy_to_stream(pass.centralfp, 
pass.filefp, PHP_STREAM_COPY_ALL, len);
-   if (SUCCESS != ret || len != cdir_size) {
+   size_t clen;
+   int ret = phar_stream_copy_to_stream(pass.centralfp, 
pass.filefp, PHP_STREAM_COPY_ALL, clen);
+   if (SUCCESS != ret || clen != cdir_size) {
if (error) {
spprintf(error, 4096, phar zip flush of \%s\ 
failed: unable to write central-directory, phar-fname);
}

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