[PHP-CVS] cvs: php-src(PHP_5_2) / buildconf.bat /win32/build buildconf.js
kalle Sat Jan 3 03:27:47 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-srcbuildconf.bat
/php-src/win32/buildbuildconf.js
Log:
MFH:
* Redirect the "1 file(s) copied" message to nul
* Check if configure script was copied, and output an error if it wasn't
http://cvs.php.net/viewvc.cgi/php-src/buildconf.bat?r1=1.1.6.1&r2=1.1.6.2&diff_format=u
Index: php-src/buildconf.bat
diff -u php-src/buildconf.bat:1.1.6.1 php-src/buildconf.bat:1.1.6.2
--- php-src/buildconf.bat:1.1.6.1 Mon Dec 8 22:42:51 2008
+++ php-src/buildconf.bat Sat Jan 3 03:27:47 2009
@@ -1,5 +1,7 @@
@echo off
cscript /nologo win32\build\buildconf.js %*
SET PHP_BUILDCONF_PATH=%~dp0
-copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH%
+copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > nul
SET PHP_SDK_SCRIPT_PATH=
+
+IF NOT EXIST %PHP_BUILDCONF_PATH% (echo Error generating configure script,
configure script was not copied) ELSE (echo Now run 'cscript /nologo
configure.js --help')
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/win32/build/buildconf.js?r1=1.13.2.2.2.1&r2=1.13.2.2.2.2&diff_format=u
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.13.2.2.2.1
php-src/win32/build/buildconf.js:1.13.2.2.2.2
--- php-src/win32/build/buildconf.js:1.13.2.2.2.1 Mon Jan 1 19:32:09 2007
+++ php-src/win32/build/buildconf.jsSat Jan 3 03:27:47 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: buildconf.js,v 1.13.2.2.2.1 2007/01/01 19:32:09 iliaa Exp $ */
+/* $Id: buildconf.js,v 1.13.2.2.2.2 2009/01/03 03:27:47 kalle Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine("Rebuilding configure.js");
@@ -259,5 +259,3 @@
C.WriteBlankLines(1);
C.Write(file_get_contents("win32/build/configure.tail"));
-WScript.StdOut.WriteLine("Now run 'cscript /nologo configure.js --help'");
-
--
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) /main network.c
Em Sex, 2009-01-02 às 14:34 -0800, Andi Gutmans escreveu:
> Does this mean you should be using WSASetLastError() on Windows?
>
You are right! :)
> Andi
>
> > -Original Message-
> > From: Felipe Pena [mailto:fel...@php.net]
> > Sent: Friday, January 02, 2009 1:43 PM
> > To: php-cvs@lists.php.net
> > Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /main network.c
> >
> > felipe Fri Jan 2 21:42:52 2009 UTC
> >
> > Modified files: (Branch: PHP_5_3)
> > /php-src/main network.c
> > Log:
> > - MFH: Errr, rule nº 1: be portable :)
> >
> > http://cvs.php.net/viewvc.cgi/php-
> > src/main/network.c?r1=1.118.2.2.2.6.2.12&r2=1.118.2.2.2.6.2.13&diff_format=u
> > Index: php-src/main/network.c
> > diff -u php-src/main/network.c:1.118.2.2.2.6.2.12 php-
> > src/main/network.c:1.118.2.2.2.6.2.13
> > --- php-src/main/network.c:1.118.2.2.2.6.2.12 Fri Jan 2 21:28:28 2009
> > +++ php-src/main/network.c Fri Jan 2 21:42:52 2009
> > @@ -17,7 +17,7 @@
> > +--+
> > */
> >
> > -/* $Id: network.c,v 1.118.2.2.2.6.2.12 2009/01/02 21:28:28 felipe Exp $ */
> > +/* $Id: network.c,v 1.118.2.2.2.6.2.13 2009/01/02 21:42:52 felipe Exp $ */
> >
> > /*#define DEBUG_MAIN_NETWORK 1*/
> >
> > @@ -1147,7 +1147,9 @@
> > tv.tv_sec = timeout / 1000;
> > tv.tv_usec = (timeout - (tv.tv_sec * 1000)) * 1000;
> > }
> > +#ifndef PHP_WIN32
> > errno = 0;
> > +#endif
> > n = select(max_fd + 1, &rset, &wset, &eset, timeout >= 0 ? &tv : NULL);
> >
> > if (n >= 0) {
> >
> >
> >
> > --
> > PHP CVS Mailing List (http://www.php.net/)
> > To unsubscribe, visit: http://www.php.net/unsub.php
>
--
Regards,
Felipe Pena
--
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) /main network.c
felipe Sat Jan 3 00:06:59 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/main network.c Log: - MFH: Windows part http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.15&r2=1.118.2.2.2.16&diff_format=u Index: php-src/main/network.c diff -u php-src/main/network.c:1.118.2.2.2.15 php-src/main/network.c:1.118.2.2.2.16 --- php-src/main/network.c:1.118.2.2.2.15 Fri Jan 2 21:43:07 2009 +++ php-src/main/network.c Sat Jan 3 00:06:59 2009 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: network.c,v 1.118.2.2.2.15 2009/01/02 21:43:07 felipe Exp $ */ +/* $Id: network.c,v 1.118.2.2.2.16 2009/01/03 00:06:59 felipe Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ @@ -1141,7 +1141,10 @@ tv.tv_sec = timeout / 1000; tv.tv_usec = (timeout - (tv.tv_sec * 1000)) * 1000; } -#ifndef PHP_WIN32 +/* Reseting/initializing */ +#ifdef PHP_WIN32 + WSASetLastError(0); +#else errno = 0; #endif n = select(max_fd + 1, &rset, &wset, &eset, timeout >= 0 ? &tv : NULL); -- 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) /main network.c
felipe Sat Jan 3 00:06:33 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/main network.c Log: - MFH: Windows part http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.6.2.13&r2=1.118.2.2.2.6.2.14&diff_format=u Index: php-src/main/network.c diff -u php-src/main/network.c:1.118.2.2.2.6.2.13 php-src/main/network.c:1.118.2.2.2.6.2.14 --- php-src/main/network.c:1.118.2.2.2.6.2.13 Fri Jan 2 21:42:52 2009 +++ php-src/main/network.c Sat Jan 3 00:06:33 2009 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: network.c,v 1.118.2.2.2.6.2.13 2009/01/02 21:42:52 felipe Exp $ */ +/* $Id: network.c,v 1.118.2.2.2.6.2.14 2009/01/03 00:06:33 felipe Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ @@ -1147,7 +1147,10 @@ tv.tv_sec = timeout / 1000; tv.tv_usec = (timeout - (tv.tv_sec * 1000)) * 1000; } -#ifndef PHP_WIN32 +/* Reseting/initializing */ +#ifdef PHP_WIN32 + WSASetLastError(0); +#else errno = 0; #endif n = select(max_fd + 1, &rset, &wset, &eset, timeout >= 0 ? &tv : NULL); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main network.c
felipe Sat Jan 3 00:05:53 2009 UTC Modified files: /php-src/main network.c Log: - Windows part http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.140&r2=1.141&diff_format=u Index: php-src/main/network.c diff -u php-src/main/network.c:1.140 php-src/main/network.c:1.141 --- php-src/main/network.c:1.140Fri Jan 2 21:42:25 2009 +++ php-src/main/network.c Sat Jan 3 00:05:53 2009 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: network.c,v 1.140 2009/01/02 21:42:25 felipe Exp $ */ +/* $Id: network.c,v 1.141 2009/01/03 00:05:53 felipe Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ @@ -1147,7 +1147,10 @@ tv.tv_sec = timeout / 1000; tv.tv_usec = (timeout - (tv.tv_sec * 1000)) * 1000; } -#ifndef PHP_WIN32 +/* Reseting/initializing */ +#ifdef PHP_WIN32 + WSASetLastError(0); +#else errno = 0; #endif n = select(max_fd + 1, &rset, &wset, &eset, timeout >= 0 ? &tv : NULL); -- 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) /main network.c
Does this mean you should be using WSASetLastError() on Windows?
Andi
> -Original Message-
> From: Felipe Pena [mailto:fel...@php.net]
> Sent: Friday, January 02, 2009 1:43 PM
> To: php-cvs@lists.php.net
> Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /main network.c
>
> felipeFri Jan 2 21:42:52 2009 UTC
>
> Modified files: (Branch: PHP_5_3)
> /php-src/main network.c
> Log:
> - MFH: Errr, rule nº 1: be portable :)
>
> http://cvs.php.net/viewvc.cgi/php-
> src/main/network.c?r1=1.118.2.2.2.6.2.12&r2=1.118.2.2.2.6.2.13&diff_format=u
> Index: php-src/main/network.c
> diff -u php-src/main/network.c:1.118.2.2.2.6.2.12 php-
> src/main/network.c:1.118.2.2.2.6.2.13
> --- php-src/main/network.c:1.118.2.2.2.6.2.12 Fri Jan 2 21:28:28 2009
> +++ php-src/main/network.cFri Jan 2 21:42:52 2009
> @@ -17,7 +17,7 @@
> +--+
> */
>
> -/* $Id: network.c,v 1.118.2.2.2.6.2.12 2009/01/02 21:28:28 felipe Exp $ */
> +/* $Id: network.c,v 1.118.2.2.2.6.2.13 2009/01/02 21:42:52 felipe Exp $ */
>
> /*#define DEBUG_MAIN_NETWORK 1*/
>
> @@ -1147,7 +1147,9 @@
> tv.tv_sec = timeout / 1000;
> tv.tv_usec = (timeout - (tv.tv_sec * 1000)) * 1000;
> }
> +#ifndef PHP_WIN32
> errno = 0;
> +#endif
> n = select(max_fd + 1, &rset, &wset, &eset, timeout >= 0 ? &tv : NULL);
>
> if (n >= 0) {
>
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
--
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) /main network.c
felipe Fri Jan 2 21:43:07 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main network.c
Log:
- MFH: Errr, rule nº 1: be portable :)
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.14&r2=1.118.2.2.2.15&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.14
php-src/main/network.c:1.118.2.2.2.15
--- php-src/main/network.c:1.118.2.2.2.14 Fri Jan 2 21:29:04 2009
+++ php-src/main/network.c Fri Jan 2 21:43:07 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.118.2.2.2.14 2009/01/02 21:29:04 felipe Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.15 2009/01/02 21:43:07 felipe Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -1141,7 +1141,9 @@
tv.tv_sec = timeout / 1000;
tv.tv_usec = (timeout - (tv.tv_sec * 1000)) * 1000;
}
+#ifndef PHP_WIN32
errno = 0;
+#endif
n = select(max_fd + 1, &rset, &wset, &eset, timeout >= 0 ? &tv : NULL);
if (n >= 0) {
--
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) /main network.c
felipe Fri Jan 2 21:42:52 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main network.c
Log:
- MFH: Errr, rule nº 1: be portable :)
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.6.2.12&r2=1.118.2.2.2.6.2.13&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.6.2.12
php-src/main/network.c:1.118.2.2.2.6.2.13
--- php-src/main/network.c:1.118.2.2.2.6.2.12 Fri Jan 2 21:28:28 2009
+++ php-src/main/network.c Fri Jan 2 21:42:52 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.118.2.2.2.6.2.12 2009/01/02 21:28:28 felipe Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.6.2.13 2009/01/02 21:42:52 felipe Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -1147,7 +1147,9 @@
tv.tv_sec = timeout / 1000;
tv.tv_usec = (timeout - (tv.tv_sec * 1000)) * 1000;
}
+#ifndef PHP_WIN32
errno = 0;
+#endif
n = select(max_fd + 1, &rset, &wset, &eset, timeout >= 0 ? &tv : NULL);
if (n >= 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main network.c
felipe Fri Jan 2 21:42:25 2009 UTC
Modified files:
/php-src/main network.c
Log:
- Errr, rule nº 1: be portable :)
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.139&r2=1.140&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.139 php-src/main/network.c:1.140
--- php-src/main/network.c:1.139Fri Jan 2 21:26:42 2009
+++ php-src/main/network.c Fri Jan 2 21:42:25 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.139 2009/01/02 21:26:42 felipe Exp $ */
+/* $Id: network.c,v 1.140 2009/01/02 21:42:25 felipe Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -1147,7 +1147,9 @@
tv.tv_sec = timeout / 1000;
tv.tv_usec = (timeout - (tv.tv_sec * 1000)) * 1000;
}
+#ifndef PHP_WIN32
errno = 0;
+#endif
n = select(max_fd + 1, &rset, &wset, &eset, timeout >= 0 ? &tv : NULL);
if (n >= 0) {
--
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) /main network.c
felipe Fri Jan 2 21:29:05 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main network.c
Log:
- MFH: Working with unintialized errno (#46917, noticed by Jost Boekemeier)
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.13&r2=1.118.2.2.2.14&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.13
php-src/main/network.c:1.118.2.2.2.14
--- php-src/main/network.c:1.118.2.2.2.13 Wed Dec 31 11:17:47 2008
+++ php-src/main/network.c Fri Jan 2 21:29:04 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.118.2.2.2.13 2008/12/31 11:17:47 sebastian Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.14 2009/01/02 21:29:04 felipe Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -1141,6 +1141,7 @@
tv.tv_sec = timeout / 1000;
tv.tv_usec = (timeout - (tv.tv_sec * 1000)) * 1000;
}
+ errno = 0;
n = select(max_fd + 1, &rset, &wset, &eset, timeout >= 0 ? &tv : NULL);
if (n >= 0) {
--
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) /main network.c
felipe Fri Jan 2 21:28:28 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main network.c
Log:
- MFH: Working with unintialized errno (#46917, noticed by Jost Boekemeier)
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.6.2.11&r2=1.118.2.2.2.6.2.12&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.6.2.11
php-src/main/network.c:1.118.2.2.2.6.2.12
--- php-src/main/network.c:1.118.2.2.2.6.2.11 Wed Dec 31 11:15:47 2008
+++ php-src/main/network.c Fri Jan 2 21:28:28 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.118.2.2.2.6.2.11 2008/12/31 11:15:47 sebastian Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.6.2.12 2009/01/02 21:28:28 felipe Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -1147,6 +1147,7 @@
tv.tv_sec = timeout / 1000;
tv.tv_usec = (timeout - (tv.tv_sec * 1000)) * 1000;
}
+ errno = 0;
n = select(max_fd + 1, &rset, &wset, &eset, timeout >= 0 ? &tv : NULL);
if (n >= 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main network.c
felipe Fri Jan 2 21:26:42 2009 UTC
Modified files:
/php-src/main network.c
Log:
- Working with unintialized errno (#46917, noticed by Jost Boekemeier)
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.138&r2=1.139&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.138 php-src/main/network.c:1.139
--- php-src/main/network.c:1.138Wed Dec 31 11:12:38 2008
+++ php-src/main/network.c Fri Jan 2 21:26:42 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.138 2008/12/31 11:12:38 sebastian Exp $ */
+/* $Id: network.c,v 1.139 2009/01/02 21:26:42 felipe Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -1147,6 +1147,7 @@
tv.tv_sec = timeout / 1000;
tv.tv_usec = (timeout - (tv.tv_sec * 1000)) * 1000;
}
+ errno = 0;
n = select(max_fd + 1, &rset, &wset, &eset, timeout >= 0 ? &tv : NULL);
if (n >= 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar phar.c
iliaa Fri Jan 2 20:43:58 2009 UTC
Modified files:
/php-src/ext/phar phar.c
Log:
MFB: Fixed a possible crash when phar_create_signature() fails
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.393&r2=1.394&diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.393 php-src/ext/phar/phar.c:1.394
--- php-src/ext/phar/phar.c:1.393 Wed Dec 31 11:12:35 2008
+++ php-src/ext/phar/phar.c Fri Jan 2 20:43:58 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.393 2008/12/31 11:12:35 sebastian Exp $ */
+/* $Id: phar.c,v 1.394 2009/01/02 20:43:58 iliaa Exp $ */
#define PHAR_MAIN 1
#include "phar_internal.h"
@@ -3122,7 +3122,7 @@
return EOF;
#endif
default: {
- char *digest;
+ char *digest = NULL;
int digest_len;
if (FAILURE == phar_create_signature(phar,
newfile, &digest, &digest_len, error TSRMLS_CC)) {
@@ -3131,7 +3131,9 @@
spprintf(error, 0, "phar error:
unable to write signature: %s", save);
efree(save);
}
- efree(digest);
+ if (digest) {
+ efree(digest);
+ }
if (closeoldfile) {
php_stream_close(oldfile);
}
@@ -3624,7 +3626,7 @@
php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION);
php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION);
- php_info_print_table_row(2, "CVS revision", "$Revision: 1.393 $");
+ php_info_print_table_row(2, "CVS revision", "$Revision: 1.394 $");
php_info_print_table_row(2, "Phar-based phar archives", "enabled");
php_info_print_table_row(2, "Tar-based phar archives", "enabled");
php_info_print_table_row(2, "ZIP-based phar archives", "enabled");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.c
iliaa Fri Jan 2 20:43:41 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar.c
Log:
Fixed a possible crash when phar_create_signature() fails
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.55&r2=1.370.2.56&diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.55 php-src/ext/phar/phar.c:1.370.2.56
--- php-src/ext/phar/phar.c:1.370.2.55 Wed Dec 31 11:15:42 2008
+++ php-src/ext/phar/phar.c Fri Jan 2 20:43:41 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.370.2.55 2008/12/31 11:15:42 sebastian Exp $ */
+/* $Id: phar.c,v 1.370.2.56 2009/01/02 20:43:41 iliaa Exp $ */
#define PHAR_MAIN 1
#include "phar_internal.h"
@@ -3122,7 +3122,7 @@
return EOF;
#endif
default: {
- char *digest;
+ char *digest = NULL;
int digest_len;
if (FAILURE == phar_create_signature(phar,
newfile, &digest, &digest_len, error TSRMLS_CC)) {
@@ -3131,7 +3131,9 @@
spprintf(error, 0, "phar error:
unable to write signature: %s", save);
efree(save);
}
- efree(digest);
+ if (digest) {
+ efree(digest);
+ }
if (closeoldfile) {
php_stream_close(oldfile);
}
@@ -3624,7 +3626,7 @@
php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION);
php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION);
- php_info_print_table_row(2, "CVS revision", "$Revision: 1.370.2.55 $");
+ php_info_print_table_row(2, "CVS revision", "$Revision: 1.370.2.56 $");
php_info_print_table_row(2, "Phar-based phar archives", "enabled");
php_info_print_table_row(2, "Tar-based phar archives", "enabled");
php_info_print_table_row(2, "ZIP-based phar archives", "enabled");
--
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 /ext/standard basic_functions.c /main SAPI.h main.c /sapi/cgi cgi_main.c /sapi/cli php_cli.c /sapi/embed php_embed.c
Ok will ask him to take a look when he's back. Cheers, Andi > -Original Message- > From: Marcus Boerger [mailto:he...@php.net] > Sent: Friday, January 02, 2009 4:04 AM > To: Andi Gutmans > Cc: Marcus Boerger; php-cvs@lists.php.net > Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard > basic_functions.c /main SAPI.h main.c /sapi/cgi cgi_main.c /sapi/cli php_cli.c > /sapi/embed php_embed.c > > Hello Andi, > > my main goal was to get rid of dl() for apache and alike modules and get > the c level API changes in. For FastCGI I guess you are right, but I would > appreciate if Dmitry could look into it. As far as I understand the only > thing we have to do is to pass the function table containing the dl() only > if we are not in FastCGI mode. So basically if ther is no -b command line > flag. > > marcus > > Friday, January 2, 2009, 5:47:09 AM, you wrote: > > > Hi Marcus, > > > I think dl() should also be disabled for FastCGI. > > It may require a bit of reordering of the code to make this work but I > > think it's the right thing. > > > If you bump into any problems then maybe Dmitry could help out but he's > > on vacation for the next couple of weeks. > > > Thanks! > > Andi > > > -Original Message- > > From: Marcus Boerger [mailto:he...@php.net] > > Sent: Wednesday, December 31, 2008 6:27 AM > > To: php-cvs@lists.php.net; php...@lists.php.net > > Subject: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard > > basic_functions.c /main SAPI.h main.c /sapi/cgi cgi_main.c /sapi/cli > > php_cli.c /sapi/embed php_embed.c > > > helly Wed Dec 31 14:27:10 2008 UTC > > > Modified files: (Branch: PHP_5_3) > > /php-srcNEWS > > /php-src/ext/standard basic_functions.c > > /php-src/main SAPI.h main.c > > /php-src/sapi/cgi cgi_main.c > > /php-src/sapi/cli php_cli.c > > /php-src/sapi/embed php_embed.c > > Log: > > MFH > > - Changed dl() to be disabled by default. Enabled only when explicitly > > registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. > > (Dmitry) > > [DOC] > > > > > > http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.428&r > > 2=1.2027.2.547.2.965.2.429&diff_format=u > > Index: php-src/NEWS > > diff -u php-src/NEWS:1.2027.2.547.2.965.2.428 > > php-src/NEWS:1.2027.2.547.2.965.2.429 > > --- php-src/NEWS:1.2027.2.547.2.965.2.428 Tue Dec 30 23:34:29 2008 > > +++ php-src/NEWSWed Dec 31 14:27:08 2008 > > @@ -6,6 +6,8 @@ > > - Deprecated session_register(), session_unregister() and > >session_is_registered(). (Hannes) > > > > +- Changed dl() to be disabled by default. Enabled only when explicitly > > + registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. > > (Dmitry) > > - Changed opendir(), dir() and scandir() to use default context when no > > context > >argument is passed. (Sara) > > - Changed open_basedir to allow tightening in runtime contexts. (Sara) > > http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1= > > 1.725.2.31.2.64.2.79&r2=1.725.2.31.2.64.2.80&diff_format=u > > Index: php-src/ext/standard/basic_functions.c > > diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.79 > > php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.80 > > --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.79 Wed > Dec > > 31 11:15:44 2008 > > +++ php-src/ext/standard/basic_functions.c Wed Dec 31 14:27:09 2008 > > @@ -18,7 +18,7 @@ > > > > +--+ > > */ > > > > -/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.79 2008/12/31 11:15:44 > > sebastian Exp $ */ > > +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.80 2008/12/31 14:27:09 > > helly Exp $ */ > > > > #include "php.h" > > #include "php_streams.h" > > @@ -3025,9 +3025,6 @@ > > PHP_FE(is_scalar, > > arginfo_is_scalar) > > PHP_FE(is_callable, > > arginfo_is_callable) > > > > - /* functions from dl.c */ > > - PHP_FE(dl, > > arginfo_dl) > > - > > /* functions from file.c */ > > PHP_FE(pclose, > > arginfo_pclose) > > PHP_FE(popen, > > arginfo_popen) > > http://cvs.php.net/viewvc.cgi/php-src/main/SAPI.h?r1=1.114.2.1.2.3.2.5&r > > 2=1.114.2.1.2.3.2.6&diff_format=u > > Index: php-src/main/SAPI.h > > diff -u php-src/main/SAPI.h:1.114.2.1.2.3.2.5 > > php-src/main/SAPI.h:1.114.2.1.2.3.2.6 > > --- php-src/main/SAPI.h:1.114.2.1.2.3.2.5 Wed Dec 31 11:15:47 2008 > > +++ php-src/main/SAPI.h Wed Dec 31 14:27:09 2008 > > @@ -16,7 +16,7 @@ > > > > +--+ > > */ > > > > -/* $Id: SAPI.h,v 1.114.2.1.2.3.2.5 2008/12/31 11:15:47 sebastian Exp $ > > */ > > +/* $Id: SAPI.h,v 1.114.2.1.2.3.2.6 2008/12/31 14:27:09 helly Exp $ */ > > > > #ifndef SAPI_H > > #define SAPI_H > > @@ -264,6 +264,7 @@ > > int phpinfo_as_text; > > > > char *ini_entries;
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/cli php_cli.c ZendEngine2 zend.c zend_exceptions.c zend_exceptions.h zend_execute_API.c
helly Fri Jan 2 13:14:50 2009 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2zend.c zend_execute_API.c zend_exceptions.c
zend_exceptions.h
/php-src/sapi/cli php_cli.c
Log:
- MFH Catch exceptions in cli -a
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.35.2.27&r2=1.308.2.12.2.35.2.28&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.308.2.12.2.35.2.27
ZendEngine2/zend.c:1.308.2.12.2.35.2.28
--- ZendEngine2/zend.c:1.308.2.12.2.35.2.27 Wed Dec 31 14:05:22 2008
+++ ZendEngine2/zend.c Fri Jan 2 13:14:49 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend.c,v 1.308.2.12.2.35.2.27 2008/12/31 14:05:22 helly Exp $ */
+/* $Id: zend.c,v 1.308.2.12.2.35.2.28 2009/01/02 13:14:49 helly Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -1199,10 +1199,10 @@
}
} else {
zend_exception_restore(TSRMLS_C);
-
zend_exception_error(EG(exception) TSRMLS_CC);
+
zend_exception_error(EG(exception), E_ERROR TSRMLS_CC);
}
} else {
- zend_exception_error(EG(exception)
TSRMLS_CC);
+ zend_exception_error(EG(exception),
E_ERROR TSRMLS_CC);
}
}
destroy_op_array(EG(active_op_array) TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.24.2.68&r2=1.331.2.20.2.24.2.69&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.68
ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.69
--- ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.68 Wed Dec 31 11:15:32 2008
+++ ZendEngine2/zend_execute_API.c Fri Jan 2 13:14:49 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.68 2008/12/31 11:15:32
sebastian Exp $ */
+/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.69 2009/01/02 13:14:49 helly
Exp $ */
#include
#include
@@ -1184,7 +1184,7 @@
result = zend_eval_string(str, retval_ptr, string_name TSRMLS_CC);
if (handle_exceptions && EG(exception)) {
- zend_exception_error(EG(exception) TSRMLS_CC);
+ zend_exception_error(EG(exception), E_ERROR TSRMLS_CC);
result = FAILURE;
}
return result;
@@ -1253,7 +1253,7 @@
zend_execute(CG(active_op_array) TSRMLS_CC);
if (EG(exception)) {
- zend_exception_error(EG(exception) TSRMLS_CC);
+ zend_exception_error(EG(exception), E_ERROR TSRMLS_CC);
}
CG(active_op_array)->last -= 1; /* get rid of that ZEND_RETURN */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_exceptions.c?r1=1.79.2.6.2.9.2.19&r2=1.79.2.6.2.9.2.20&diff_format=u
Index: ZendEngine2/zend_exceptions.c
diff -u ZendEngine2/zend_exceptions.c:1.79.2.6.2.9.2.19
ZendEngine2/zend_exceptions.c:1.79.2.6.2.9.2.20
--- ZendEngine2/zend_exceptions.c:1.79.2.6.2.9.2.19 Wed Dec 31 11:15:32 2008
+++ ZendEngine2/zend_exceptions.c Fri Jan 2 13:14:49 2009
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: zend_exceptions.c,v 1.79.2.6.2.9.2.19 2008/12/31 11:15:32 sebastian
Exp $ */
+/* $Id: zend_exceptions.c,v 1.79.2.6.2.9.2.20 2009/01/02 13:14:49 helly Exp $
*/
#include "zend.h"
#include "zend_API.h"
@@ -739,8 +739,8 @@
}
/* }}} */
-/* This function doesn't return as it calls E_ERROR */
-ZEND_API void zend_exception_error(zval *exception TSRMLS_DC) /* {{{ */
+/* This function doesn't return if it uses E_ERROR */
+ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC) /*
{{{ */
{
zend_class_entry *ce_exception = Z_OBJCE_P(exception);
if (instanceof_function(ce_exception, default_exception_ce TSRMLS_CC)) {
@@ -774,9 +774,9 @@
file = zend_read_property(default_exception_ce, exception,
"file", sizeof("file")-1, 1 TSRMLS_CC);
line = zend_read_property(default_exception_ce, exception,
"line", sizeof("line")-1, 1 TSRMLS_CC);
- zend_error_va(E_ERROR, Z_STRVAL_P(file), Z_LVAL_P(line),
"Uncaught %s\n thrown", Z_STRVAL_P(str));
+ zend_error_va(severity, Z_STRVAL_P(file), Z_LVAL_P(line),
"Uncaught %s\n thrown", Z_STRVAL_P(str));
} else {
- zend_error(E_ERROR, "Uncaught exception '%s'",
ce_exception->name);
+ zend_error(severity, "Uncaught exception '%s'",
ce_exception->name);
[PHP-CVS] cvs: php-src /sapi/cli php_cli.c ZendEngine2 zend.c zend_exceptions.c zend_exceptions.h zend_execute_API.c
helly Fri Jan 2 13:14:17 2009 UTC
Modified files:
/ZendEngine2zend.c zend_execute_API.c zend_exceptions.c
zend_exceptions.h
/php-src/sapi/cli php_cli.c
Log:
- Catch exceptions in cli -a
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.427&r2=1.428&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.427 ZendEngine2/zend.c:1.428
--- ZendEngine2/zend.c:1.427Wed Dec 31 12:24:56 2008
+++ ZendEngine2/zend.c Fri Jan 2 13:14:16 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend.c,v 1.427 2008/12/31 12:24:56 helly Exp $ */
+/* $Id: zend.c,v 1.428 2009/01/02 13:14:16 helly Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -1728,10 +1728,10 @@
}
} else {
zend_exception_restore(TSRMLS_C);
-
zend_exception_error(EG(exception) TSRMLS_CC);
+
zend_exception_error(EG(exception), E_ERROR TSRMLS_CC);
}
} else {
- zend_exception_error(EG(exception)
TSRMLS_CC);
+ zend_exception_error(EG(exception),
E_ERROR TSRMLS_CC);
}
}
destroy_op_array(EG(active_op_array) TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.470&r2=1.471&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.470
ZendEngine2/zend_execute_API.c:1.471
--- ZendEngine2/zend_execute_API.c:1.470Wed Dec 31 11:12:29 2008
+++ ZendEngine2/zend_execute_API.c Fri Jan 2 13:14:17 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_execute_API.c,v 1.470 2008/12/31 11:12:29 sebastian Exp $ */
+/* $Id: zend_execute_API.c,v 1.471 2009/01/02 13:14:17 helly Exp $ */
#include
#include
@@ -1312,7 +1312,7 @@
result = zend_u_eval_string(type, str, retval_ptr, string_name
TSRMLS_CC);
if (handle_exceptions && EG(exception)) {
- zend_exception_error(EG(exception) TSRMLS_CC);
+ zend_exception_error(EG(exception), E_ERROR TSRMLS_CC);
result = FAILURE;
}
return result;
@@ -1387,7 +1387,7 @@
zend_execute(CG(active_op_array) TSRMLS_CC);
if (EG(exception)) {
- zend_exception_error(EG(exception) TSRMLS_CC);
+ zend_exception_error(EG(exception), E_ERROR TSRMLS_CC);
}
CG(active_op_array)->last -= 1; /* get rid of that ZEND_RETURN */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_exceptions.c?r1=1.131&r2=1.132&diff_format=u
Index: ZendEngine2/zend_exceptions.c
diff -u ZendEngine2/zend_exceptions.c:1.131 ZendEngine2/zend_exceptions.c:1.132
--- ZendEngine2/zend_exceptions.c:1.131 Wed Dec 31 11:12:28 2008
+++ ZendEngine2/zend_exceptions.c Fri Jan 2 13:14:17 2009
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: zend_exceptions.c,v 1.131 2008/12/31 11:12:28 sebastian Exp $ */
+/* $Id: zend_exceptions.c,v 1.132 2009/01/02 13:14:17 helly Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -817,8 +817,8 @@
}
/* }}} */
-/* This function doesn't return as it calls E_ERROR */
-ZEND_API void zend_exception_error(zval *exception TSRMLS_DC) /* {{{ */
+/* This function doesn't return if it uses E_ERROR */
+ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC) /*
{{{ */
{
zend_class_entry *ce_exception = Z_OBJCE_P(exception);
if (instanceof_function(ce_exception, default_exception_ce TSRMLS_CC)) {
@@ -861,10 +861,10 @@
zend_error_va(E_ERROR, Z_STRVAL(copy), Z_LVAL_P(line),
"Uncaught %R\n thrown", Z_TYPE_P(str), Z_UNIVAL_P(str));
zval_dtor(©);
} else {
- zend_error_va(E_ERROR, Z_STRVAL_P(file),
Z_LVAL_P(line), "Uncaught %R\n thrown", Z_TYPE_P(str), Z_UNIVAL_P(str));
+ zend_error_va(severity, Z_STRVAL_P(file),
Z_LVAL_P(line), "Uncaught %R\n thrown", Z_TYPE_P(str), Z_UNIVAL_P(str));
}
} else {
- zend_error(E_ERROR, "Uncaught exception '%v'",
ce_exception->name);
+ zend_error(severity, "Uncaught exception '%v'",
ce_exception->name);
}
}
/* }}} */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_exceptions.h?r1=1.32&r2=1.33&diff_format=u
Index: ZendEngine2/zend_exceptions.h
diff -u ZendEngine2/zend_exceptions.h:1.32 ZendEngine2/zend_exceptions.h:1.33
--- ZendEngine2/zend_exceptions.h:1.32 Wed Dec 31 1
Re: [PHP-CVS] cvs: php-src / buildconf.bat
Hi Pierre 2009/1/2 Pierre Joye : > hi Kalle, > > Please revert or add a tests+error reporting if it fails, I added a check to see if the configure script wasn't copied > > Cheers, > > 2009/1/2 Kalle Sommer Nielsen : >> kalle Fri Jan 2 05:50:51 2009 UTC >> >> Modified files: >>/php-srcbuildconf.bat >> Log: >> Redirect the "1 file(s) copied" message to nul >> >> http://cvs.php.net/viewvc.cgi/php-src/buildconf.bat?r1=1.3&r2=1.4&diff_format=u >> Index: php-src/buildconf.bat >> diff -u php-src/buildconf.bat:1.3 php-src/buildconf.bat:1.4 >> --- php-src/buildconf.bat:1.3 Mon Dec 8 22:41:54 2008 >> +++ php-src/buildconf.bat Fri Jan 2 05:50:51 2009 >> @@ -1,5 +1,5 @@ >> @echo off >> cscript /nologo win32\build\buildconf.js %* >> SET PHP_BUILDCONF_PATH=%~dp0 >> -copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% >> +copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > >> nul >> SET PHP_SDK_SCRIPT_PATH= >> >> >> >> -- >> PHP CVS Mailing List (http://www.php.net/) >> To unsubscribe, visit: http://www.php.net/unsub.php >> >> > > > > -- > Pierre > > http://blog.thepimp.net | http://www.libgd.org > regrads -- Kalle Sommer Nielsen -- 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) / buildconf.bat /win32/build buildconf.js
kalle Fri Jan 2 12:18:21 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcbuildconf.bat
/php-src/win32/buildbuildconf.js
Log:
MFH: Check if configure script was copied, and output an error if it wasn't
http://cvs.php.net/viewvc.cgi/php-src/buildconf.bat?r1=1.1.8.3&r2=1.1.8.4&diff_format=u
Index: php-src/buildconf.bat
diff -u php-src/buildconf.bat:1.1.8.3 php-src/buildconf.bat:1.1.8.4
--- php-src/buildconf.bat:1.1.8.3 Fri Jan 2 05:51:20 2009
+++ php-src/buildconf.bat Fri Jan 2 12:18:21 2009
@@ -3,3 +3,5 @@
SET PHP_BUILDCONF_PATH=%~dp0
copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > nul
SET PHP_SDK_SCRIPT_PATH=
+
+IF NOT EXIST %PHP_BUILDCONF_PATH% (echo Error generating configure script,
configure script was not copied) ELSE (echo Now run 'configure --help')
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/win32/build/buildconf.js?r1=1.13.2.2.2.1.2.4&r2=1.13.2.2.2.1.2.5&diff_format=u
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.13.2.2.2.1.2.4
php-src/win32/build/buildconf.js:1.13.2.2.2.1.2.5
--- php-src/win32/build/buildconf.js:1.13.2.2.2.1.2.4 Sun Jul 20 02:20:31 2008
+++ php-src/win32/build/buildconf.jsFri Jan 2 12:18:21 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: buildconf.js,v 1.13.2.2.2.1.2.4 2008/07/20 02:20:31 sfox Exp $ */
+/* $Id: buildconf.js,v 1.13.2.2.2.1.2.5 2009/01/02 12:18:21 kalle Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine("Rebuilding configure.js");
@@ -278,4 +278,3 @@
B.WriteLine("@echo off");
B.WriteLine("cscript /nologo configure.js %*");
-WScript.StdOut.WriteLine("Now run 'configure --help'");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / buildconf.bat /win32/build buildconf.js
kalle Fri Jan 2 12:16:42 2009 UTC
Modified files:
/php-srcbuildconf.bat
/php-src/win32/buildbuildconf.js
Log:
Check if configure script was copied, and output an error if it wasn't
http://cvs.php.net/viewvc.cgi/php-src/buildconf.bat?r1=1.4&r2=1.5&diff_format=u
Index: php-src/buildconf.bat
diff -u php-src/buildconf.bat:1.4 php-src/buildconf.bat:1.5
--- php-src/buildconf.bat:1.4 Fri Jan 2 05:50:51 2009
+++ php-src/buildconf.bat Fri Jan 2 12:16:42 2009
@@ -3,3 +3,5 @@
SET PHP_BUILDCONF_PATH=%~dp0
copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > nul
SET PHP_SDK_SCRIPT_PATH=
+
+IF NOT EXIST %PHP_BUILDCONF_PATH% (echo Error generating configure script,
configure script was not copied) ELSE (echo Now run 'configure --help')
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/win32/build/buildconf.js?r1=1.19&r2=1.20&diff_format=u
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.19
php-src/win32/build/buildconf.js:1.20
--- php-src/win32/build/buildconf.js:1.19 Mon Jul 21 09:56:37 2008
+++ php-src/win32/build/buildconf.jsFri Jan 2 12:16:42 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: buildconf.js,v 1.19 2008/07/21 09:56:37 sfox Exp $ */
+/* $Id: buildconf.js,v 1.20 2009/01/02 12:16:42 kalle Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine("Rebuilding configure.js");
@@ -278,4 +278,3 @@
B.WriteLine("@echo off");
B.WriteLine("cscript /nologo configure.js %*");
-WScript.StdOut.WriteLine("Now run 'configure --help'");
--
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) /ext/json/tests bug41567.phpt
scottmacFri Jan 2 12:13:10 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/json/tests bug41567.phpt Log: Duplicate INI sections http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug41567.phpt?r1=1.1.2.6&r2=1.1.2.7&diff_format=u Index: php-src/ext/json/tests/bug41567.phpt diff -u php-src/ext/json/tests/bug41567.phpt:1.1.2.6 php-src/ext/json/tests/bug41567.phpt:1.1.2.7 --- php-src/ext/json/tests/bug41567.phpt:1.1.2.6Wed Nov 19 17:00:13 2008 +++ php-src/ext/json/tests/bug41567.phptFri Jan 2 12:13:10 2009 @@ -12,8 +12,6 @@ echo "Done\n"; ?> ---INI-- -precision=14 --EXPECT-- float(123456789.12345) Done -- 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 /ext/standard basic_functions.c /main SAPI.h main.c /sapi/cgi cgi_main.c /sapi/cli php_cli.c /sapi/embed php_embed.c
Hello Andi, my main goal was to get rid of dl() for apache and alike modules and get the c level API changes in. For FastCGI I guess you are right, but I would appreciate if Dmitry could look into it. As far as I understand the only thing we have to do is to pass the function table containing the dl() only if we are not in FastCGI mode. So basically if ther is no -b command line flag. marcus Friday, January 2, 2009, 5:47:09 AM, you wrote: > Hi Marcus, > I think dl() should also be disabled for FastCGI. > It may require a bit of reordering of the code to make this work but I > think it's the right thing. > If you bump into any problems then maybe Dmitry could help out but he's > on vacation for the next couple of weeks. > Thanks! > Andi > -Original Message- > From: Marcus Boerger [mailto:he...@php.net] > Sent: Wednesday, December 31, 2008 6:27 AM > To: php-cvs@lists.php.net; php...@lists.php.net > Subject: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard > basic_functions.c /main SAPI.h main.c /sapi/cgi cgi_main.c /sapi/cli > php_cli.c /sapi/embed php_embed.c > helly Wed Dec 31 14:27:10 2008 UTC > Modified files: (Branch: PHP_5_3) > /php-srcNEWS > /php-src/ext/standard basic_functions.c > /php-src/main SAPI.h main.c > /php-src/sapi/cgi cgi_main.c > /php-src/sapi/cli php_cli.c > /php-src/sapi/embed php_embed.c > Log: > MFH > - Changed dl() to be disabled by default. Enabled only when explicitly > registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. > (Dmitry) > [DOC] > > > http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.428&r > 2=1.2027.2.547.2.965.2.429&diff_format=u > Index: php-src/NEWS > diff -u php-src/NEWS:1.2027.2.547.2.965.2.428 > php-src/NEWS:1.2027.2.547.2.965.2.429 > --- php-src/NEWS:1.2027.2.547.2.965.2.428 Tue Dec 30 23:34:29 2008 > +++ php-src/NEWSWed Dec 31 14:27:08 2008 > @@ -6,6 +6,8 @@ > - Deprecated session_register(), session_unregister() and >session_is_registered(). (Hannes) > > +- Changed dl() to be disabled by default. Enabled only when explicitly > + registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. > (Dmitry) > - Changed opendir(), dir() and scandir() to use default context when no > context >argument is passed. (Sara) > - Changed open_basedir to allow tightening in runtime contexts. (Sara) > http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1= > 1.725.2.31.2.64.2.79&r2=1.725.2.31.2.64.2.80&diff_format=u > Index: php-src/ext/standard/basic_functions.c > diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.79 > php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.80 > --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.79 Wed Dec > 31 11:15:44 2008 > +++ php-src/ext/standard/basic_functions.c Wed Dec 31 14:27:09 2008 > @@ -18,7 +18,7 @@ > > +--+ > */ > > -/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.79 2008/12/31 11:15:44 > sebastian Exp $ */ > +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.80 2008/12/31 14:27:09 > helly Exp $ */ > > #include "php.h" > #include "php_streams.h" > @@ -3025,9 +3025,6 @@ > PHP_FE(is_scalar, > arginfo_is_scalar) > PHP_FE(is_callable, > arginfo_is_callable) > > - /* functions from dl.c */ > - PHP_FE(dl, > arginfo_dl) > - > /* functions from file.c */ > PHP_FE(pclose, > arginfo_pclose) > PHP_FE(popen, > arginfo_popen) > http://cvs.php.net/viewvc.cgi/php-src/main/SAPI.h?r1=1.114.2.1.2.3.2.5&r > 2=1.114.2.1.2.3.2.6&diff_format=u > Index: php-src/main/SAPI.h > diff -u php-src/main/SAPI.h:1.114.2.1.2.3.2.5 > php-src/main/SAPI.h:1.114.2.1.2.3.2.6 > --- php-src/main/SAPI.h:1.114.2.1.2.3.2.5 Wed Dec 31 11:15:47 2008 > +++ php-src/main/SAPI.h Wed Dec 31 14:27:09 2008 > @@ -16,7 +16,7 @@ > > +--+ > */ > > -/* $Id: SAPI.h,v 1.114.2.1.2.3.2.5 2008/12/31 11:15:47 sebastian Exp $ > */ > +/* $Id: SAPI.h,v 1.114.2.1.2.3.2.6 2008/12/31 14:27:09 helly Exp $ */ > > #ifndef SAPI_H > #define SAPI_H > @@ -264,6 +264,7 @@ > int phpinfo_as_text; > > char *ini_entries; > + const zend_function_entry *additional_functions; > }; > > > http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.4 > 0&r2=1.640.2.23.2.57.2.41&diff_format=u > Index: php-src/main/main.c > diff -u php-src/main/main.c:1.640.2.23.2.57.2.40 > php-src/main/main.c:1.640.2.23.2.57.2.41 > --- php-src/main/main.c:1.640.2.23.2.57.2.40Wed Dec 31 14:05:22 2008 > +++ php-src/main/main.c Wed Dec 31 14:27:09 2008 > @@ -18,7 +18,7 @@ > > +--+ > */ > > -/* $Id: main.c,v 1.640.2.23.2.57.2.40 2008/12/31 14:05:22 helly Exp $ > */
Re: [PHP-CVS] cvs: php-src / buildconf.bat
hi Kalle, Please revert or add a tests+error reporting if it fails, Cheers, 2009/1/2 Kalle Sommer Nielsen : > kalle Fri Jan 2 05:50:51 2009 UTC > > Modified files: >/php-srcbuildconf.bat > Log: > Redirect the "1 file(s) copied" message to nul > > http://cvs.php.net/viewvc.cgi/php-src/buildconf.bat?r1=1.3&r2=1.4&diff_format=u > Index: php-src/buildconf.bat > diff -u php-src/buildconf.bat:1.3 php-src/buildconf.bat:1.4 > --- php-src/buildconf.bat:1.3 Mon Dec 8 22:41:54 2008 > +++ php-src/buildconf.bat Fri Jan 2 05:50:51 2009 > @@ -1,5 +1,5 @@ > @echo off > cscript /nologo win32\build\buildconf.js %* > SET PHP_BUILDCONF_PATH=%~dp0 > -copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > +copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > > nul > SET PHP_SDK_SCRIPT_PATH= > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
