[PHP-CVS] cvs: php-src(PHP_4_3) /main streams.c
thetaphiThu Apr 7 03:28:08 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main streams.c
Log:
Bug #32614 - prevent from crahsing with segfault on solaris if fdopen() fails
- this fixes NOT the stdio-problem on solaris!
http://cvs.php.net/diff.php/php-src/main/streams.c?r1=1.125.2.94&r2=1.125.2.95&ty=u
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.94 php-src/main/streams.c:1.125.2.95
--- php-src/main/streams.c:1.125.2.94 Mon Apr 4 16:26:49 2005
+++ php-src/main/streams.c Thu Apr 7 03:28:08 2005
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: streams.c,v 1.125.2.94 2005/04/04 20:26:49 pollita Exp $ */
+/* $Id: streams.c,v 1.125.2.95 2005/04/07 07:28:08 thetaphi Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1595,6 +1595,9 @@
if (ret) {
if (data->file == NULL) {
data->file = fdopen(data->fd,
stream->mode);
+ if (data->file == NULL) {
+ return FAILURE;
+ }
}
*(FILE**)ret = data->file;
data->fd = -1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /main/streams plain_wrapper.c
thetaphiThu Apr 7 03:28:54 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/main/streams plain_wrapper.c
Log:
Bug #32614 - prevent from crahsing with segfault on solaris if fdopen() fails
- this fixes NOT the stdio-problem on solaris!
http://cvs.php.net/diff.php/php-src/main/streams/plain_wrapper.c?r1=1.39.2.4&r2=1.39.2.5&ty=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.39.2.4
php-src/main/streams/plain_wrapper.c:1.39.2.5
--- php-src/main/streams/plain_wrapper.c:1.39.2.4 Wed Apr 6 09:59:48 2005
+++ php-src/main/streams/plain_wrapper.cThu Apr 7 03:28:53 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.39.2.4 2005/04/06 13:59:48 iliaa Exp $ */
+/* $Id: plain_wrapper.c,v 1.39.2.5 2005/04/07 07:28:53 thetaphi Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -461,6 +461,9 @@
/* we were opened as a plain file
descriptor, so we
* need fdopen now */
data->file = fdopen(data->fd,
stream->mode);
+ if (data->file == NULL) {
+ return FAILURE;
+ }
}
*(FILE**)ret = data->file;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams plain_wrapper.c
thetaphiThu Apr 7 03:29:14 2005 EDT
Modified files:
/php-src/main/streams plain_wrapper.c
Log:
Bug #32614 - prevent from crahsing with segfault on solaris if fdopen() fails
- this fixes NOT the stdio-problem on solaris!
http://cvs.php.net/diff.php/php-src/main/streams/plain_wrapper.c?r1=1.43&r2=1.44&ty=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.43
php-src/main/streams/plain_wrapper.c:1.44
--- php-src/main/streams/plain_wrapper.c:1.43 Wed Apr 6 09:57:30 2005
+++ php-src/main/streams/plain_wrapper.cThu Apr 7 03:29:14 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.43 2005/04/06 13:57:30 iliaa Exp $ */
+/* $Id: plain_wrapper.c,v 1.44 2005/04/07 07:29:14 thetaphi Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -461,6 +461,9 @@
/* we were opened as a plain file
descriptor, so we
* need fdopen now */
data->file = fdopen(data->fd,
stream->mode);
+ if (data->file == NULL) {
+ return FAILURE;
+ }
}
*(FILE**)ret = data->file;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: A!p$ghsa
Please r564g!he4a56a3haafdogu#mfn3o +++ Attachment: No Virus found +++ MC-Afee AntiVirus - www.mcafee.com -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Thu Apr 7 12:09:27 2005 EDT Modified files: /CVSROOTavail Log: Karma for skoduru http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.967&r2=1.968&ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.967 CVSROOT/avail:1.968 --- CVSROOT/avail:1.967 Wed Apr 6 13:57:40 2005 +++ CVSROOT/avail Thu Apr 7 12:09:26 2005 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs|phpfi,php3,php-src,pecl,non-pecl,pear,peardoc,spl,phpdoc,ZendAPI,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh +avail|msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru|phpfi,php3,php-src,pecl,non-pecl,pear,peardoc,spl,phpdoc,ZendAPI,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh # The Livedocs developers -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/calendar calendar.c
dmitry Thu Apr 7 12:12:28 2005 EDT
Modified files:
/php-src/ext/calendar calendar.c
Log:
Fixed wrong result of cal_days_in_month() with bad dates
http://cvs.php.net/diff.php/php-src/ext/calendar/calendar.c?r1=1.41&r2=1.42&ty=u
Index: php-src/ext/calendar/calendar.c
diff -u php-src/ext/calendar/calendar.c:1.41
php-src/ext/calendar/calendar.c:1.42
--- php-src/ext/calendar/calendar.c:1.41Mon Oct 11 02:39:41 2004
+++ php-src/ext/calendar/calendar.c Thu Apr 7 12:12:27 2005
@@ -18,7 +18,7 @@
| Wez Furlong <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: calendar.c,v 1.41 2004/10/11 06:39:41 iliaa Exp $ */
+/* $Id: calendar.c,v 1.42 2005/04/07 16:12:27 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -246,6 +246,11 @@
sdn_start = calendar->to_jd(year, month, 1);
+ if (sdn_start == 0) {
+php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid date.");
+RETURN_FALSE;
+ }
+
sdn_next = calendar->to_jd(year, 1 + month, 1);
if (sdn_next == 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_0) /ext/calendar calendar.c
dmitry Thu Apr 7 12:12:47 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/calendar calendar.c
Log:
Fixed wrong result of cal_days_in_month() with bad dates
http://cvs.php.net/diff.php/php-src/ext/calendar/calendar.c?r1=1.40.2.1&r2=1.40.2.2&ty=u
Index: php-src/ext/calendar/calendar.c
diff -u php-src/ext/calendar/calendar.c:1.40.2.1
php-src/ext/calendar/calendar.c:1.40.2.2
--- php-src/ext/calendar/calendar.c:1.40.2.1Mon Oct 11 02:40:20 2004
+++ php-src/ext/calendar/calendar.c Thu Apr 7 12:12:47 2005
@@ -18,7 +18,7 @@
| Wez Furlong <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: calendar.c,v 1.40.2.1 2004/10/11 06:40:20 iliaa Exp $ */
+/* $Id: calendar.c,v 1.40.2.2 2005/04/07 16:12:47 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -246,6 +246,11 @@
sdn_start = calendar->to_jd(year, month, 1);
+ if (sdn_start == 0) {
+php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid date.");
+RETURN_FALSE;
+ }
+
sdn_next = calendar->to_jd(year, 1 + month, 1);
if (sdn_next == 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_0) /ext/calendar calendar.c
dmitry Thu Apr 7 12:16:28 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/calendar calendar.c
Log:
Fixed indentation
http://cvs.php.net/diff.php/php-src/ext/calendar/calendar.c?r1=1.40.2.2&r2=1.40.2.3&ty=u
Index: php-src/ext/calendar/calendar.c
diff -u php-src/ext/calendar/calendar.c:1.40.2.2
php-src/ext/calendar/calendar.c:1.40.2.3
--- php-src/ext/calendar/calendar.c:1.40.2.2Thu Apr 7 12:12:47 2005
+++ php-src/ext/calendar/calendar.c Thu Apr 7 12:16:28 2005
@@ -18,7 +18,7 @@
| Wez Furlong <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: calendar.c,v 1.40.2.2 2005/04/07 16:12:47 dmitry Exp $ */
+/* $Id: calendar.c,v 1.40.2.3 2005/04/07 16:16:28 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -247,8 +247,8 @@
sdn_start = calendar->to_jd(year, month, 1);
if (sdn_start == 0) {
-php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid date.");
-RETURN_FALSE;
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid date.");
+ RETURN_FALSE;
}
sdn_next = calendar->to_jd(year, 1 + month, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/calendar calendar.c
dmitry Thu Apr 7 12:17:09 2005 EDT
Modified files:
/php-src/ext/calendar calendar.c
Log:
Fixed indentation
http://cvs.php.net/diff.php/php-src/ext/calendar/calendar.c?r1=1.42&r2=1.43&ty=u
Index: php-src/ext/calendar/calendar.c
diff -u php-src/ext/calendar/calendar.c:1.42
php-src/ext/calendar/calendar.c:1.43
--- php-src/ext/calendar/calendar.c:1.42Thu Apr 7 12:12:27 2005
+++ php-src/ext/calendar/calendar.c Thu Apr 7 12:17:08 2005
@@ -18,7 +18,7 @@
| Wez Furlong <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: calendar.c,v 1.42 2005/04/07 16:12:27 dmitry Exp $ */
+/* $Id: calendar.c,v 1.43 2005/04/07 16:17:08 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -247,8 +247,8 @@
sdn_start = calendar->to_jd(year, month, 1);
if (sdn_start == 0) {
-php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid date.");
-RETURN_FALSE;
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid date.");
+ RETURN_FALSE;
}
sdn_next = calendar->to_jd(year, 1 + month, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard file.c /main/streams plain_wrapper.c
Was this problem only in PHP5.* ?
--Jani
On Wed, 6 Apr 2005, Ilia Alshanetsky wrote:
iliaa Wed Apr 6 09:57:31 2005 EDT
Modified files:
/php-src/ext/standardfile.c
/php-src/main/streamsplain_wrapper.c
Log:
Fixed bug #31363 (broken non-blocking flock()).
# Patch by ian at snork dot net
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.405&r2=1.406&ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.405 php-src/ext/standard/file.c:1.406
--- php-src/ext/standard/file.c:1.405 Sun Mar 27 10:52:49 2005
+++ php-src/ext/standard/file.c Wed Apr 6 09:57:30 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.405 2005/03/27 15:52:49 iliaa Exp $ */
+/* $Id: file.c,v 1.406 2005/04/06 13:57:30 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -339,13 +339,13 @@
/* flock_values contains all possible actions if (operation & 4) we
won't block on the lock */
act = flock_values[act - 1] | (operation & 4 ? LOCK_NB : 0);
- if (!php_stream_lock(stream, act)) {
+ if (php_stream_lock(stream, act)) {
if (operation && errno == EWOULDBLOCK && arg3 &&
PZVAL_IS_REF(arg3)) {
Z_LVAL_P(arg3) = 1;
}
- RETURN_TRUE;
+ RETURN_FALSE;
}
- RETURN_FALSE;
+ RETURN_TRUE;
}
/* }}} */
http://cvs.php.net/diff.php/php-src/main/streams/plain_wrapper.c?r1=1.42&r2=1.43&ty=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.42
php-src/main/streams/plain_wrapper.c:1.43
--- php-src/main/streams/plain_wrapper.c:1.42 Thu Oct 28 01:05:20 2004
+++ php-src/main/streams/plain_wrapper.cWed Apr 6 09:57:30 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.42 2004/10/28 05:05:20 tony2001 Exp $ */
+/* $Id: plain_wrapper.c,v 1.43 2005/04/06 13:57:30 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -578,7 +578,7 @@
return 0;
}
- if (!flock(fd, value) || (errno == EWOULDBLOCK && value
& LOCK_NB)) {
+ if (!flock(fd, value)) {
data->lock_flag = value;
return 0;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/calendar calendar.c
Doesn't this problem exist in PHP_4_3 branch?
--Jani
On Thu, 7 Apr 2005, Dmitry Stogov wrote:
dmitry Thu Apr 7 12:12:28 2005 EDT
Modified files:
/php-src/ext/calendarcalendar.c
Log:
Fixed wrong result of cal_days_in_month() with bad dates
http://cvs.php.net/diff.php/php-src/ext/calendar/calendar.c?r1=1.41&r2=1.42&ty=u
Index: php-src/ext/calendar/calendar.c
diff -u php-src/ext/calendar/calendar.c:1.41
php-src/ext/calendar/calendar.c:1.42
--- php-src/ext/calendar/calendar.c:1.41Mon Oct 11 02:39:41 2004
+++ php-src/ext/calendar/calendar.c Thu Apr 7 12:12:27 2005
@@ -18,7 +18,7 @@
| Wez Furlong <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: calendar.c,v 1.41 2004/10/11 06:39:41 iliaa Exp $ */
+/* $Id: calendar.c,v 1.42 2005/04/07 16:12:27 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -246,6 +246,11 @@
sdn_start = calendar->to_jd(year, month, 1);
+ if (sdn_start == 0) {
+php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid date.");
+RETURN_FALSE;
+ }
+
sdn_next = calendar->to_jd(year, 1 + month, 1);
if (sdn_next == 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/calendar calendar.c
On Thu, 7 Apr 2005, Dmitry Stogov wrote:
> @@ -246,6 +246,11 @@
>
> sdn_start = calendar->to_jd(year, month, 1);
>
> + if (sdn_start == 0) {
> +php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid date.");
> +RETURN_FALSE;
> + }
> +
> sdn_next = calendar->to_jd(year, 1 + month, 1);
Please make sure you stick to our coding standards... we use tabs, not
spaces :)
Derick
--
Derick Rethans
http://derickrethans.nl | http://ez.no | http://xdebug.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main/streams streams.c
Should Antony revert his patch then..?
(wasn't Wez basically saying that? :)
--Jani
On Wed, 6 Apr 2005, Ilia Alshanetsky wrote:
I checked the code with valgrind and it seems to me like the problem lies else
where. According to valgrind (at some point, probably the last line) we have a
Conditional jump or move depends on uninitialised value(s)
php_stream_get_record (/php5/main/streams/streams.c:847)
Ilia
Antony Dovgal wrote:
On Wed, 6 Apr 2005 09:05:35 -0400
Wez Furlong <[EMAIL PROTECTED]> wrote:
What problem does this fix?
EOF can be a temporary condition for network streams, depending on
non-blocking status, and the read call is used to re-enable it. (yay
for backward compatibility).
stream_get_line() gives a lot of garbage trying to read after EOF and
segfaults with this code:
$fp = fopen(dirname(__FILE__)."/test.txt", 'r');
while ($data = stream_get_line($fp, 100, "|")) {
var_dump($data);
}
?>
test.txt contents:
---
line1 | some | another
---
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
sniper Thu Apr 7 16:22:56 2005 EDT
Modified files:
/php-srcrun-tests.php
Log:
- Reword the send-report-part a bit. (bug #32624)
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.211&r2=1.212&ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.211 php-src/run-tests.php:1.212
--- php-src/run-tests.php:1.211 Wed Apr 6 18:14:27 2005
+++ php-src/run-tests.php Thu Apr 7 16:22:55 2005
@@ -456,12 +456,13 @@
define('PHP_QA_EMAIL', '[EMAIL PROTECTED]');
define('QA_SUBMISSION_PAGE', 'http://qa.php.net/buildtest-process.php');
-/* We got failed Tests, offer the user to send and e-mail to QA team, unless
NO_INTERACTION is set */
+/* We got failed Tests, offer the user to send an e-mail to QA team, unless
NO_INTERACTION is set */
if (!getenv('NO_INTERACTION')) {
$fp = fopen("php://stdin", "r+");
- echo "\nPlease allow this report to be send to the PHP QA\nteam. This
will give us a better understanding in how\n";
- echo "PHP's test cases are doing.\n";
- echo "(choose \"s\" to just save the results to a file)? [Yns]: ";
+ echo "\nYou may have found a problem in PHP.\nWe would like to send
this report automatically to the\n";
+ echo "PHP QA team, to give us a better understanding of how\nthe test
cases are doing. If you don't want to send it\n";
+ echo "immediately, you can choose \"s\" to save the report to\na file
that you can send us later.\n";
+ echo "Do you want to send this report now? [Yns]: ";
flush();
$user_input = fgets($fp, 10);
$just_save_results = (strtolower($user_input[0]) == 's');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / run-tests.php
sniper Thu Apr 7 16:23:19 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcrun-tests.php
Log:
MFH
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.195.2.7&r2=1.195.2.8&ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.195.2.7 php-src/run-tests.php:1.195.2.8
--- php-src/run-tests.php:1.195.2.7 Wed Apr 6 18:15:40 2005
+++ php-src/run-tests.php Thu Apr 7 16:23:19 2005
@@ -423,12 +423,13 @@
define('PHP_QA_EMAIL', '[EMAIL PROTECTED]');
define('QA_SUBMISSION_PAGE', 'http://qa.php.net/buildtest-process.php');
-/* We got failed Tests, offer the user to send and e-mail to QA team, unless
NO_INTERACTION is set */
+/* We got failed Tests, offer the user to send an e-mail to QA team, unless
NO_INTERACTION is set */
if (!getenv('NO_INTERACTION')) {
$fp = fopen("php://stdin", "r+");
- echo "\nPlease allow this report to be send to the PHP QA\nteam. This
will give us a better understanding in how\n";
- echo "PHP's test cases are doing.\n";
- echo "(choose \"s\" to just save the results to a file)? [Yns]: ";
+ echo "\nYou may have found a problem in PHP.\nWe would like to send
this report automatically to the\n";
+ echo "PHP QA team, to give us a better understanding of how\nthe test
cases are doing. If you don't want to send it\n";
+ echo "immediately, you can choose \"s\" to save the report to\na file
that you can send us later.\n";
+ echo "Do you want to send this report now? [Yns]: ";
flush();
$user_input = fgets($fp, 10);
$just_save_results = (strtolower($user_input[0]) == 's');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4
sniper Thu Apr 7 16:39:03 2005 EDT Modified files: /php-srcacinclude.m4 Log: - Cleanup a bit. And make use of shtool mkdir http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.297&r2=1.298&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.297 php-src/acinclude.m4:1.298 --- php-src/acinclude.m4:1.297 Thu Mar 10 17:35:18 2005 +++ php-src/acinclude.m4Thu Apr 7 16:39:02 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.297 2005/03/10 22:35:18 rrichards Exp $ +dnl $Id: acinclude.m4,v 1.298 2005/04/07 20:39:02 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2205,8 +2205,7 @@ unset ICONV_DIR # Create the directories for a VPATH build: - test -d ext || mkdir ext - test -d ext/iconv || mkdir ext/iconv + $php_shtool mkdir -p ext/iconv echo > ext/iconv/php_have_bsd_iconv.h echo > ext/iconv/php_have_glibc_iconv.h @@ -2221,11 +2220,11 @@ dnl if test "$PHP_ICONV" = "yes"; then AC_CHECK_FUNC(iconv, [ - PHP_DEFINE(HAVE_ICONV,1,[ext/iconv]) found_iconv=yes ],[ AC_CHECK_FUNC(libiconv,[ PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv]) +AC_DEFINE(HAVE_LIBICONV, 1, [ ]) found_iconv=yes ]) ]) @@ -2259,10 +2258,10 @@ PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [ found_iconv=yes PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv]) +AC_DEFINE(HAVE_LIBICONV,1,[ ]) ], [ PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [ found_iconv=yes - PHP_DEFINE(HAVE_ICONV,1,[ext/iconv]) ], [], [ -L$ICONV_DIR/$PHP_LIBDIR ]) @@ -2273,8 +2272,9 @@ fi if test "$found_iconv" = "yes"; then +PHP_DEFINE(HAVE_ICONV,1,[ext/iconv]) +AC_DEFINE(HAVE_ICONV,1,[ ]) if test -n "$ICONV_DIR"; then - AC_DEFINE(HAVE_ICONV, 1, [ ]) PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/$PHP_LIBDIR, $1) PHP_ADD_INCLUDE($ICONV_DIR/include) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /build build2.mk buildcheck.sh /scripts phpize.in
sniper Thu Apr 7 16:43:27 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/build build2.mk buildcheck.sh
/php-src/scriptsphpize.in
Log:
MFH: Use PHP_AUTOCONF / PHP_AUTOHEADER environment variables
http://cvs.php.net/diff.php/php-src/build/build2.mk?r1=1.30.2.5&r2=1.30.2.6&ty=u
Index: php-src/build/build2.mk
diff -u php-src/build/build2.mk:1.30.2.5 php-src/build/build2.mk:1.30.2.6
--- php-src/build/build2.mk:1.30.2.5Thu Feb 3 12:42:59 2005
+++ php-src/build/build2.mk Thu Apr 7 16:43:25 2005
@@ -14,7 +14,7 @@
# | Author: Sascha Schumann <[EMAIL PROTECTED]> |
# +--+
#
-# $Id: build2.mk,v 1.30.2.5 2005/02/03 17:42:59 sniper Exp $
+# $Id: build2.mk,v 1.30.2.6 2005/04/07 20:43:25 sniper Exp $
#
include generated_lists
@@ -32,6 +32,9 @@
targets = $(TOUCH_FILES) configure $(config_h_in)
+PHP_AUTOCONF ?= 'autoconf'
+PHP_AUTOHEADER ?= 'autoheader'
+
SUPPRESS_WARNINGS ?= 2>&1 | (egrep -v '(AC_TRY_RUN called without default to
allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in
acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_DECL_YYTEXT
is expanded from...|the top level)'||true)
all: $(targets)
@@ -45,7 +48,7 @@
# correctly otherwise (timestamps are not updated)
@echo rebuilding $@
@rm -f $@
- autoheader $(SUPPRESS_WARNINGS)
+ $(PHP_AUTOHEADER) $(SUPPRESS_WARNINGS)
$(TOUCH_FILES):
touch $(TOUCH_FILES)
@@ -56,5 +59,5 @@
configure: aclocal.m4 configure.in $(config_m4_files)
@echo rebuilding $@
- autoconf $(SUPPRESS_WARNINGS)
+ $(PHP_AUTOCONF) $(SUPPRESS_WARNINGS)
http://cvs.php.net/diff.php/php-src/build/buildcheck.sh?r1=1.30.2.4&r2=1.30.2.5&ty=u
Index: php-src/build/buildcheck.sh
diff -u php-src/build/buildcheck.sh:1.30.2.4
php-src/build/buildcheck.sh:1.30.2.5
--- php-src/build/buildcheck.sh:1.30.2.4Wed Jan 19 20:41:52 2005
+++ php-src/build/buildcheck.sh Thu Apr 7 16:43:26 2005
@@ -16,15 +16,20 @@
# | Sascha Schumann <[EMAIL PROTECTED]>|
# +--+
#
-# $Id: buildcheck.sh,v 1.30.2.4 2005/01/20 01:41:52 sniper Exp $
+# $Id: buildcheck.sh,v 1.30.2.5 2005/04/07 20:43:26 sniper Exp $
#
echo "buildconf: checking installation..."
stamp=$1
+# Allow the autoconf executable to be overriden by $PHP_AUTOCONF.
+if test -z "$PHP_AUTOCONF"; then
+ PHP_AUTOCONF='autoconf'
+fi
+
# autoconf 2.13 or newer
-ac_version=`autoconf --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e
's/[a-z]* *$//'`
+ac_version=`$PHP_AUTOCONF --version 2>/dev/null|head -n 1|sed -e
's/^[^0-9]*//' -e 's/[a-z]* *$//'`
if test -z "$ac_version"; then
echo "buildconf: autoconf not found."
echo " You need autoconf version 2.13 or newer installed"
http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.15.2.3&r2=1.15.2.4&ty=u
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.15.2.3 php-src/scripts/phpize.in:1.15.2.4
--- php-src/scripts/phpize.in:1.15.2.3 Tue Jan 25 07:54:57 2005
+++ php-src/scripts/phpize.in Thu Apr 7 16:43:27 2005
@@ -80,9 +80,33 @@
if test ! -x "$builddir/build/shtool"; then
phpize_no_shtool
exit 1
+ else
+php_shtool=$builddir/build/shtool
fi
}
+phpize_check_autotools()
+{
+ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
+ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
+
+ if ! test -x "$php_shtool path $PHP_AUTOCONF"; then
+echo
[PHP-CVS] cvs: php-src(PHP_4_3) /build build2.mk buildcheck.sh /scripts phpize.in
sniper Thu Apr 7 16:49:02 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/build build2.mk buildcheck.sh
/php-src/scriptsphpize.in
Log:
MFH
http://cvs.php.net/diff.php/php-src/build/build2.mk?r1=1.27.4.8&r2=1.27.4.9&ty=u
Index: php-src/build/build2.mk
diff -u php-src/build/build2.mk:1.27.4.8 php-src/build/build2.mk:1.27.4.9
--- php-src/build/build2.mk:1.27.4.8Thu Feb 3 12:43:04 2005
+++ php-src/build/build2.mk Thu Apr 7 16:49:00 2005
@@ -14,7 +14,7 @@
# | Author: Sascha Schumann <[EMAIL PROTECTED]> |
# +--+
#
-# $Id: build2.mk,v 1.27.4.8 2005/02/03 17:43:04 sniper Exp $
+# $Id: build2.mk,v 1.27.4.9 2005/04/07 20:49:00 sniper Exp $
#
include generated_lists
@@ -32,6 +32,9 @@
targets = $(TOUCH_FILES) configure $(config_h_in)
+PHP_AUTOCONF ?= 'autoconf'
+PHP_AUTOHEADER ?= 'autoheader'
+
SUPPRESS_WARNINGS ?= 2>&1 | (egrep -v '(AC_TRY_RUN called without default to
allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in
acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_DECL_YYTEXT
is expanded from...|the top level)'||true)
all: $(targets)
@@ -45,7 +48,7 @@
# correctly otherwise (timestamps are not updated)
@echo rebuilding $@
@rm -f $@
- autoheader $(SUPPRESS_WARNINGS)
+ $(PHP_AUTOHEADER) $(SUPPRESS_WARNINGS)
$(TOUCH_FILES):
touch $(TOUCH_FILES)
@@ -56,5 +59,5 @@
configure: aclocal.m4 configure.in $(config_m4_files)
@echo rebuilding $@
- autoconf $(SUPPRESS_WARNINGS)
+ $(PHP_AUTOCONF) $(SUPPRESS_WARNINGS)
http://cvs.php.net/diff.php/php-src/build/buildcheck.sh?r1=1.21.2.11&r2=1.21.2.12&ty=u
Index: php-src/build/buildcheck.sh
diff -u php-src/build/buildcheck.sh:1.21.2.11
php-src/build/buildcheck.sh:1.21.2.12
--- php-src/build/buildcheck.sh:1.21.2.11 Wed Jan 19 20:43:18 2005
+++ php-src/build/buildcheck.sh Thu Apr 7 16:49:00 2005
@@ -16,15 +16,20 @@
# | Sascha Schumann <[EMAIL PROTECTED]>|
# +--+
#
-# $Id: buildcheck.sh,v 1.21.2.11 2005/01/20 01:43:18 sniper Exp $
+# $Id: buildcheck.sh,v 1.21.2.12 2005/04/07 20:49:00 sniper Exp $
#
echo "buildconf: checking installation..."
stamp=$1
+# Allow the autoconf executable to be overriden by $PHP_AUTOCONF.
+if test -z "$PHP_AUTOCONF"; then
+ PHP_AUTOCONF='autoconf'
+fi
+
# autoconf 2.13 or newer
-ac_version=`autoconf --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e
's/[a-z]* *$//'`
+ac_version=`$PHP_AUTOCONF --version 2>/dev/null|head -n 1|sed -e
's/^[^0-9]*//' -e 's/[a-z]* *$//'`
if test -z "$ac_version"; then
echo "buildconf: autoconf not found."
echo " You need autoconf version 2.13 or newer installed"
@@ -42,7 +47,9 @@
fi
if test "$1" = "2" && test "$2" -ge "50"; then
- echo "buildconf: running cvsclean."
+ echo "buildconf: Your version of autoconf likely contains buggy cache code."
+ echo " Running cvsclean for you."
+ echo " To avoid this, install autoconf-2.13 and automake-1.5."
./cvsclean
stamp=
fi
http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.1.2.13&r2=1.1.2.14&ty=u
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.1.2.13 php-src/scripts/phpize.in:1.1.2.14
--- php-src/scripts/phpize.in:1.1.2.13 Tue Jan 25 07:55:55 2005
+++ php-src/scripts/phpize.in Thu Apr 7 16:49:01 2005
@@ -80,9 +80,33 @@
if test ! -x "$builddir/build/shtool"; then
phpize_no_shtool
exit 1
+ else
+php_shtool=$builddir/build/shtool
fi
}
+phpize_check_autotools()
+{
+ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
+ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
+
+ if ! test -x "$php_shtool path $PHP_AUTOCONF"; then
+echo
[PHP-CVS] cvs: php-src /scripts phpize.in
sniper Thu Apr 7 18:03:04 2005 EDT
Modified files:
/php-src/scriptsphpize.in
Log:
Fix the echo/backquote issues + aclocal
http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.19&r2=1.20&ty=u
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.19 php-src/scripts/phpize.in:1.20
--- php-src/scripts/phpize.in:1.19 Thu Apr 7 02:25:28 2005
+++ php-src/scripts/phpize.in Thu Apr 7 18:03:02 2005
@@ -66,7 +66,7 @@
phpize_no_shtool()
{
- echo <> acinclude.m4)
+ (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
}
phpize_replace_prefix()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /scripts phpize.in
sniper Thu Apr 7 18:03:47 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/scriptsphpize.in
Log:
MFH
http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.15.2.4&r2=1.15.2.5&ty=u
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.15.2.4 php-src/scripts/phpize.in:1.15.2.5
--- php-src/scripts/phpize.in:1.15.2.4 Thu Apr 7 16:43:27 2005
+++ php-src/scripts/phpize.in Thu Apr 7 18:03:47 2005
@@ -66,7 +66,7 @@
phpize_no_shtool()
{
- echo <> acinclude.m4)
+ (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
}
phpize_replace_prefix()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /scripts phpize.in
sniper Thu Apr 7 18:04:26 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/scriptsphpize.in
Log:
MFH
http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.1.2.14&r2=1.1.2.15&ty=u
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.1.2.14 php-src/scripts/phpize.in:1.1.2.15
--- php-src/scripts/phpize.in:1.1.2.14 Thu Apr 7 16:49:01 2005
+++ php-src/scripts/phpize.in Thu Apr 7 18:04:26 2005
@@ -66,7 +66,7 @@
phpize_no_shtool()
{
- echo <> acinclude.m4)
+ (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
}
phpize_replace_prefix()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mysql php_mysql.c
sniper Thu Apr 7 18:23:04 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mysql php_mysql.c Log: - Fixed bug #32591 (ext/mysql: Unsatisfied symbol: ntohs with HP-UX) http://cvs.php.net/diff.php/php-src/ext/mysql/php_mysql.c?r1=1.174.2.28&r2=1.174.2.29&ty=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.174.2.28 php-src/ext/mysql/php_mysql.c:1.174.2.29 --- php-src/ext/mysql/php_mysql.c:1.174.2.28Tue Feb 22 10:00:49 2005 +++ php-src/ext/mysql/php_mysql.c Thu Apr 7 18:23:01 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_mysql.c,v 1.174.2.28 2005/02/22 15:00:49 iliaa Exp $ */ +/* $Id: php_mysql.c,v 1.174.2.29 2005/04/07 22:23:01 sniper Exp $ */ /* TODO: * @@ -51,6 +51,9 @@ # endif # include # include +# if HAVE_ARPA_INET_H +# include +# endif #endif #include -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql php_mysql.c
sniper Thu Apr 7 18:23:15 2005 EDT Modified files: /php-src/ext/mysql php_mysql.c Log: - Fixed bug #32591 (ext/mysql: Unsatisfied symbol: ntohs with HP-UX) http://cvs.php.net/diff.php/php-src/ext/mysql/php_mysql.c?r1=1.211&r2=1.212&ty=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.211 php-src/ext/mysql/php_mysql.c:1.212 --- php-src/ext/mysql/php_mysql.c:1.211 Tue Feb 22 09:58:49 2005 +++ php-src/ext/mysql/php_mysql.c Thu Apr 7 18:23:15 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_mysql.c,v 1.211 2005/02/22 14:58:49 iliaa Exp $ */ +/* $Id: php_mysql.c,v 1.212 2005/04/07 22:23:15 sniper Exp $ */ /* TODO: * @@ -52,6 +52,9 @@ # endif # include # include +# if HAVE_ARPA_INET_H +# include +# endif #endif #include -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/mysql php_mysql.c
sniper Thu Apr 7 18:23:28 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/mysql php_mysql.c Log: MFH: - Fixed bug #32591 (ext/mysql: Unsatisfied symbol: ntohs with HP-UX) http://cvs.php.net/diff.php/php-src/ext/mysql/php_mysql.c?r1=1.209.2.1&r2=1.209.2.2&ty=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.209.2.1 php-src/ext/mysql/php_mysql.c:1.209.2.2 --- php-src/ext/mysql/php_mysql.c:1.209.2.1 Tue Feb 22 09:59:30 2005 +++ php-src/ext/mysql/php_mysql.c Thu Apr 7 18:23:28 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_mysql.c,v 1.209.2.1 2005/02/22 14:59:30 iliaa Exp $ */ +/* $Id: php_mysql.c,v 1.209.2.2 2005/04/07 22:23:28 sniper Exp $ */ /* TODO: * @@ -52,6 +52,9 @@ # endif # include # include +# if HAVE_ARPA_INET_H +# include +# endif #endif #include -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
sniper Thu Apr 7 18:24:23 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.871&r2=1.1247.2.872&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.871 php-src/NEWS:1.1247.2.872 --- php-src/NEWS:1.1247.2.871 Tue Apr 5 10:49:09 2005 +++ php-src/NEWSThu Apr 7 18:24:21 2005 @@ -3,6 +3,7 @@ ?? ??? 20??, Version 4.?.? - Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes them sort based on the current locale. (Derick) +- Fixed bug #32591 (ext/mysql: Unsatisfied symbol: ntohs with HP-UX). (Jani) - Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets). (Ilia) - Fixed bug #32567 (ext/gmp fails to compile in threadsafe mode). (Tony) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS pear/LiveUser_Admin/docs/examples/example 1 User.php
sniper Thu Apr 7 18:24:44 2005 EDT Modified files: (Branch: PHP_5_0) /pear/LiveUser_Admin/docs/examples/example 1 User.php /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/pear/LiveUser_Admin/docs/examples/example/1?r1=&r2=&ty=u http://cvs.php.net/diff.php/pear/LiveUser_Admin/docs/examples/example/User.php?r1=1.16&r2=1.17&ty=u http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.314&r2=1.1760.2.315&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.314 php-src/NEWS:1.1760.2.315 --- php-src/NEWS:1.1760.2.314 Wed Apr 6 10:48:21 2005 +++ php-src/NEWSThu Apr 7 18:24:43 2005 @@ -2,6 +2,7 @@ ||| ?? ??? 2005, PHP 5.0.5 - Removed php_check_syntax() function, never worked properly. (Ilia) +- Fixed bug #32591 (ext/mysql: Unsatisfied symbol: ntohs with HP-UX). (Jani) - Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets). (Ilia) - Fixed bug #32560 (configure looks for incorrect db2 library). (Tony) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /tests/reflection .cvsignore
sniper Thu Apr 7 18:29:23 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/tests/reflection .cvsignore Log: missing entry http://cvs.php.net/diff.php/php-src/tests/reflection/.cvsignore?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/tests/reflection/.cvsignore diff -u php-src/tests/reflection/.cvsignore:1.1.2.2 php-src/tests/reflection/.cvsignore:1.1.2.3 --- php-src/tests/reflection/.cvsignore:1.1.2.2 Sun Oct 10 12:14:51 2004 +++ php-src/tests/reflection/.cvsignore Thu Apr 7 18:29:21 2005 @@ -3,5 +3,6 @@ *.log *.exp *.out +*.php *.gcda *.gcno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main/streams streams.c
If I should - just tell me, I'll do it. On Thu, 7 Apr 2005 22:01:14 +0300 (EEST) Jani Taskinen <[EMAIL PROTECTED]> wrote: > > Should Antony revert his patch then..? > (wasn't Wez basically saying that? :) > > --Jani > > > On Wed, 6 Apr 2005, Ilia Alshanetsky wrote: > > > I checked the code with valgrind and it seems to me like the problem lies > > else > > where. According to valgrind (at some point, probably the last line) we > > have a > > Conditional jump or move depends on uninitialised value(s) > > php_stream_get_record (/php5/main/streams/streams.c:847) -- Wbr, Antony Dovgal aka tony2001 [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard proc_open.c
iliaa Thu Apr 7 19:07:46 2005 EDT
Modified files:
/php-src/ext/standard proc_open.c
Log:
Fixed bug #32533 (proc_get_status() returns the incorrect process status).
http://cvs.php.net/diff.php/php-src/ext/standard/proc_open.c?r1=1.32&r2=1.33&ty=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.32
php-src/ext/standard/proc_open.c:1.33
--- php-src/ext/standard/proc_open.c:1.32 Mon Mar 7 11:17:12 2005
+++ php-src/ext/standard/proc_open.cThu Apr 7 19:07:45 2005
@@ -15,7 +15,7 @@
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: proc_open.c,v 1.32 2005/03/07 16:17:12 iliaa Exp $ */
+/* $Id: proc_open.c,v 1.33 2005/04/07 23:07:45 iliaa Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -402,6 +402,7 @@
exitcode = WEXITSTATUS(wstatus);
}
if (WIFSIGNALED(wstatus)) {
+ running = 0;
signaled = 1;
#ifdef NETWARE
termsig = WIFTERMSIG(wstatus);
@@ -413,7 +414,7 @@
stopped = 1;
stopsig = WSTOPSIG(wstatus);
}
- } else {
+ } else if (wait_pid == -1) {
running = 0;
}
#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_0) / NEWS /ext/standard proc_open.c
iliaa Thu Apr 7 19:08:48 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/standard proc_open.c
Log:
MFH: Fixed bug #32533 (proc_get_status() returns the incorrect process
status).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.315&r2=1.1760.2.316&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.315 php-src/NEWS:1.1760.2.316
--- php-src/NEWS:1.1760.2.315 Thu Apr 7 18:24:43 2005
+++ php-src/NEWSThu Apr 7 19:08:45 2005
@@ -7,6 +7,7 @@
(Ilia)
- Fixed bug #32560 (configure looks for incorrect db2 library). (Tony)
- Fixed bug #32553 (mmap loads only the 1st 200 bytes on Win32). (Ilia)
+- Fixed bug #32533 (proc_get_status() returns the incorrect process status).
(Ilia)
- Fixed bug #32530 (chunk_split() does not append endstr if chunklen is
longer then the original string). (Ilia)
- Fixed bug #32491 (File upload error - unable to create a temporary file).
http://cvs.php.net/diff.php/php-src/ext/standard/proc_open.c?r1=1.28.2.3&r2=1.28.2.4&ty=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.28.2.3
php-src/ext/standard/proc_open.c:1.28.2.4
--- php-src/ext/standard/proc_open.c:1.28.2.3 Fri Mar 11 04:01:52 2005
+++ php-src/ext/standard/proc_open.cThu Apr 7 19:08:48 2005
@@ -15,7 +15,7 @@
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: proc_open.c,v 1.28.2.3 2005/03/11 09:01:52 hyanantha Exp $ */
+/* $Id: proc_open.c,v 1.28.2.4 2005/04/07 23:08:48 iliaa Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -397,6 +397,7 @@
exitcode = WEXITSTATUS(wstatus);
}
if (WIFSIGNALED(wstatus)) {
+ running = 0;
signaled = 1;
#ifdef NETWARE
termsig = WIFTERMSIG(wstatus);
@@ -408,7 +409,7 @@
stopped = 1;
stopsig = WSTOPSIG(wstatus);
}
- } else {
+ } else if (wait_pid == -1) {
running = 0;
}
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /build buildcheck.sh
jon Thu Apr 7 19:33:05 2005 EDT Modified files: /php-src/build buildcheck.sh Log: Spell "overridden" correctly. http://cvs.php.net/diff.php/php-src/build/buildcheck.sh?r1=1.35&r2=1.36&ty=u Index: php-src/build/buildcheck.sh diff -u php-src/build/buildcheck.sh:1.35 php-src/build/buildcheck.sh:1.36 --- php-src/build/buildcheck.sh:1.35Mon Apr 4 03:16:01 2005 +++ php-src/build/buildcheck.sh Thu Apr 7 19:33:03 2005 @@ -16,14 +16,14 @@ # | Sascha Schumann <[EMAIL PROTECTED]>| # +--+ # -# $Id: buildcheck.sh,v 1.35 2005/04/04 07:16:01 jon Exp $ +# $Id: buildcheck.sh,v 1.36 2005/04/07 23:33:03 jon Exp $ # echo "buildconf: checking installation..." stamp=$1 -# Allow the autoconf executable to be overriden by $PHP_AUTOCONF. +# Allow the autoconf executable to be overridden by $PHP_AUTOCONF. if test -z "$PHP_AUTOCONF"; then PHP_AUTOCONF='autoconf' fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /build buildcheck.sh
jon Thu Apr 7 19:33:37 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/build buildcheck.sh Log: MFH 1.36: Spell "overridden" correctly. http://cvs.php.net/diff.php/php-src/build/buildcheck.sh?r1=1.30.2.5&r2=1.30.2.6&ty=u Index: php-src/build/buildcheck.sh diff -u php-src/build/buildcheck.sh:1.30.2.5 php-src/build/buildcheck.sh:1.30.2.6 --- php-src/build/buildcheck.sh:1.30.2.5Thu Apr 7 16:43:26 2005 +++ php-src/build/buildcheck.sh Thu Apr 7 19:33:37 2005 @@ -16,14 +16,14 @@ # | Sascha Schumann <[EMAIL PROTECTED]>| # +--+ # -# $Id: buildcheck.sh,v 1.30.2.5 2005/04/07 20:43:26 sniper Exp $ +# $Id: buildcheck.sh,v 1.30.2.6 2005/04/07 23:33:37 jon Exp $ # echo "buildconf: checking installation..." stamp=$1 -# Allow the autoconf executable to be overriden by $PHP_AUTOCONF. +# Allow the autoconf executable to be overridden by $PHP_AUTOCONF. if test -z "$PHP_AUTOCONF"; then PHP_AUTOCONF='autoconf' fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /build buildcheck.sh
jon Thu Apr 7 19:33:50 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/build buildcheck.sh Log: MFH 1.36: Spell "overridden" correctly. http://cvs.php.net/diff.php/php-src/build/buildcheck.sh?r1=1.21.2.12&r2=1.21.2.13&ty=u Index: php-src/build/buildcheck.sh diff -u php-src/build/buildcheck.sh:1.21.2.12 php-src/build/buildcheck.sh:1.21.2.13 --- php-src/build/buildcheck.sh:1.21.2.12 Thu Apr 7 16:49:00 2005 +++ php-src/build/buildcheck.sh Thu Apr 7 19:33:50 2005 @@ -16,14 +16,14 @@ # | Sascha Schumann <[EMAIL PROTECTED]>| # +--+ # -# $Id: buildcheck.sh,v 1.21.2.12 2005/04/07 20:49:00 sniper Exp $ +# $Id: buildcheck.sh,v 1.21.2.13 2005/04/07 23:33:50 jon Exp $ # echo "buildconf: checking installation..." stamp=$1 -# Allow the autoconf executable to be overriden by $PHP_AUTOCONF. +# Allow the autoconf executable to be overridden by $PHP_AUTOCONF. if test -z "$PHP_AUTOCONF"; then PHP_AUTOCONF='autoconf' fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /main snprintf.c snprintf.h spprintf.c
sniper Fri Apr 8 01:44:54 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main snprintf.c snprintf.h spprintf.c
Log:
MFH and Fixes bug #32482 (ap_php_snprintf broken)
http://cvs.php.net/diff.php/php-src/main/snprintf.c?r1=1.17.4.11&r2=1.17.4.12&ty=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.17.4.11 php-src/main/snprintf.c:1.17.4.12
--- php-src/main/snprintf.c:1.17.4.11 Mon Nov 15 18:27:26 2004
+++ php-src/main/snprintf.c Fri Apr 8 01:44:53 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: snprintf.c,v 1.17.4.11 2004/11/15 23:27:26 fmk Exp $ */
+/* $Id: snprintf.c,v 1.17.4.12 2005/04/08 05:44:53 sniper Exp $ */
/*
* Copyright (c) 1995-1998 The Apache Group. All rights reserved.
@@ -75,6 +75,7 @@
#include "php.h"
+#include
#include
#include
#include
@@ -82,6 +83,9 @@
#include
#include
#include
+#ifdef HAVE_INTTYPES_H
+#include
+#endif
#define FALSE 0
#define TRUE 1
@@ -575,7 +579,7 @@
/*
* Flag variables
*/
- boolean_e is_long;
+ length_modifier_e modifier;
boolean_e alternate_form;
boolean_e print_sign;
boolean_e print_blank;
@@ -666,11 +670,51 @@
/*
* Modifier check
*/
- if (*fmt == 'l') {
- is_long = YES;
- fmt++;
- } else
- is_long = NO;
+ switch (*fmt) {
+ case 'L':
+ fmt++;
+ modifier = LM_LONG_DOUBLE;
+ break;
+ case 'l':
+ fmt++;
+#if SIZEOF_LONG_LONG
+ if (*fmt == 'l') {
+ fmt++;
+ modifier = LM_LONG_LONG;
+ } else
+#endif
+ modifier = LM_LONG;
+ break;
+ case 'z':
+ fmt++;
+ modifier = LM_SIZE_T;
+ break;
+ case 'j':
+ fmt++;
+#if SIZEOF_INTMAX_T
+ modifier = LM_INTMAX_T;
+#else
+ modifier = LM_SIZE_T;
+#endif
+ break;
+ case 't':
+ fmt++;
+#if SIZEOF_PTRDIFF_T
+ modifier = LM_PTRDIFF_T;
+#else
+ modifier = LM_SIZE_T;
+#endif
+ break;
+ case 'h':
+ fmt++;
+ if (*fmt == 'h') {
+ fmt++;
+ }
+ /* these are promoted to int, so no
break */
+ default:
+ modifier = LM_STD;
+ break;
+ }
/*
* Argument extraction and printing.
@@ -685,10 +729,34 @@
*/
switch (*fmt) {
case 'u':
- if (is_long)
- i_num = va_arg(ap, u_wide_int);
- else
- i_num = (wide_int) va_arg(ap,
unsigned int);
+ switch(modifier) {
+ default:
+ i_num = (wide_int)
va_arg(ap, unsigned int);
+ break;
+ case LM_LONG_DOUBLE:
+ goto fmt_error;
+ case LM_LONG:
+ i_num = (wide_int)
va_arg(ap, unsigned long int);
+ break;
+ case LM_SIZE_T:
+
