[PHP-CVS-DAILY] cvs: php4 / ChangeLog
changelog Sun Mar 9 20:32:42 2003 EDT Modified files: /php4 ChangeLog Log: ChangeLog update Index: php4/ChangeLog diff -u php4/ChangeLog:1.1289 php4/ChangeLog:1.1290 --- php4/ChangeLog:1.1289 Sat Mar 8 20:33:11 2003 +++ php4/ChangeLog Sun Mar 9 20:32:41 2003 @@ -1,3 +1,30 @@ +2003-03-09 Sara Golemon [EMAIL PROTECTED] + +* ext/standard/basic_functions.c + ext/standard/basic_functions.h + ext/standard/user_filters.c: + Adjustment to user filters reimplementation. Make a bucket an object + containing a resource(the real bucket) and a data element for direct + operations. Simplifies + user interface and reduces number of function calls/reallocs needed. + +2003-03-09 Derick Rethans [EMAIL PROTECTED] + +* (PHP_4_3) + ext/pgsql/pgsql.c: + - No C++ comments! (Patch by Magnus) + +2003-03-09 Uwe Schindler [EMAIL PROTECTED] + +* sapi/nsapi/nsapi-readme.txt + sapi/nsapi/nsapi-readme.txt: + Changes for iPlanet Webserver 6 + +2003-03-09 Derick Rethans [EMAIL PROTECTED] + +* ext/standard/string.c: + - Fix proto + 2003-03-08 Georg Richter [EMAIL PROTECTED] * ext/mysqli/mysqli.c @@ -1408,7 +1435,7 @@ * sapi/apache/libpre.c sapi/apache/php_apache_http.h: - Added missing headers and $Id: ChangeLog,v 1.1289 2003/03/09 01:33:11 changelog Exp $ tags. + Added missing headers and $Id: ChangeLog,v 1.1290 2003/03/10 01:32:41 changelog Exp $ tags. * sapi/cgi/config9.m4: MFB: Fixed bug #22356 (Do not add empty -I flags). @@ -1967,7 +1994,7 @@ main/streams/plain_wrapper.c main/streams/streams.c main/streams/userspace.c: - ws fixes + missing $Id: ChangeLog,v 1.1289 2003/03/09 01:33:11 changelog Exp $ tags, headers added + ws fixes + missing $Id: ChangeLog,v 1.1290 2003/03/10 01:32:41 changelog Exp $ tags, headers added 2003-02-19 Corne' Cornelius [EMAIL PROTECTED] @@ -2885,7 +2912,7 @@ * (PHP_4_3) sapi/cgi/cgi_main.c: - Added missing $Id: ChangeLog,v 1.1289 2003/03/09 01:33:11 changelog Exp $ tag + Added missing $Id: ChangeLog,v 1.1290 2003/03/10 01:32:41 changelog Exp $ tag 2003-02-14 Thies C. Arntzen [EMAIL PROTECTED]
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sun Mar 9 20:32:59 2003 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.191 ZendEngine2/ChangeLog:1.192 --- ZendEngine2/ChangeLog:1.191 Fri Mar 7 20:31:41 2003 +++ ZendEngine2/ChangeLog Sun Mar 9 20:32:59 2003 @@ -1,3 +1,34 @@ +2003-03-09 Zeev Suraski [EMAIL PROTECTED] + +* zend_language_parser.y: + Optimize + +* zend_compile.c + zend_compile.h + zend_language_parser.y: + Fix handling of ::foo + +* zend_compile.c: + Cleanup + +2003-03-09 Andi Gutmans [EMAIL PROTECTED] + +* zend_language_scanner.l: + - Nuke junk + +2003-03-09 Zeev Suraski [EMAIL PROTECTED] + +* zend_compile.c + zend_compile.h + zend_language_parser.y: + Fix parsing rules of namespaces/classes + +* zend_language_parser.y: + Add ability to use ::interface_name in implements + +* zend_compile.c: + Fix :: handling + 2003-03-07 Sebastian Bergmann [EMAIL PROTECTED] * ZEND_CHANGES: @@ -685,7 +716,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.191 2003/03/08 01:31:41 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.192 2003/03/10 01:32:59 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php4(PHP_4_3) /sapi/nsapi nsapi-readme.txt
thetaphiSun Mar 9 07:08:36 2003 EDT Modified files: (Branch: PHP_4_3) /php4/sapi/nsapinsapi-readme.txt Log: Changes for iPlanet Webserver 6 Index: php4/sapi/nsapi/nsapi-readme.txt diff -u php4/sapi/nsapi/nsapi-readme.txt:1.3 php4/sapi/nsapi/nsapi-readme.txt:1.3.8.1 --- php4/sapi/nsapi/nsapi-readme.txt:1.3Wed Feb 20 05:41:18 2002 +++ php4/sapi/nsapi/nsapi-readme.txtSun Mar 9 07:08:36 2003 @@ -23,10 +23,13 @@ type=magnus-internal/x-httpd-php exts=php -Add the following to obj.conf, shlib will vary depending on your OS, for -Unix it will be something like: +Add the following to obj.conf (for iPlanet/SunONE Web Server 6.0 and above however, you need to make the specified changes to the Init function +in the server-id/config/magnus.conf file, and not the server-id/config/obj.conf file): -path-to-netscape-server/bin/libphp4.so. +shlib will vary depending on your OS: + + Unix: path-to-netscape-server/bin/libphp4.so. + Windows: c:\path\to\PHP4\nsapiPHP4.dll Note! Place following two lines after mime.types init: @@ -49,7 +52,7 @@ Object name=x-httpd-php ObjectType fn=force-type type=magnus-internal/x-httpd-php Service fn=php4_execute -/Object +/Object Authentication configuration -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/nsapi nsapi-readme.txt
thetaphiSun Mar 9 07:09:06 2003 EDT Modified files: /php4/sapi/nsapinsapi-readme.txt Log: Changes for iPlanet Webserver 6 Index: php4/sapi/nsapi/nsapi-readme.txt diff -u php4/sapi/nsapi/nsapi-readme.txt:1.3 php4/sapi/nsapi/nsapi-readme.txt:1.4 --- php4/sapi/nsapi/nsapi-readme.txt:1.3Wed Feb 20 05:41:18 2002 +++ php4/sapi/nsapi/nsapi-readme.txtSun Mar 9 07:09:06 2003 @@ -23,10 +23,13 @@ type=magnus-internal/x-httpd-php exts=php -Add the following to obj.conf, shlib will vary depending on your OS, for -Unix it will be something like: +Add the following to obj.conf (for iPlanet/SunONE Web Server 6.0 and above however, you need to make the specified changes to the Init function +in the server-id/config/magnus.conf file, and not the server-id/config/obj.conf file): -path-to-netscape-server/bin/libphp4.so. +shlib will vary depending on your OS: + + Unix: path-to-netscape-server/bin/libphp4.so. + Windows: c:\path\to\PHP4\nsapiPHP4.dll Note! Place following two lines after mime.types init: @@ -49,7 +52,7 @@ Object name=x-httpd-php ObjectType fn=force-type type=magnus-internal/x-httpd-php Service fn=php4_execute -/Object +/Object Authentication configuration -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/pgsql pgsql.c
derick Sun Mar 9 14:15:19 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/pgsql pgsql.c
Log:
- No C++ comments! (Patch by Magnus)
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.244.2.11 php4/ext/pgsql/pgsql.c:1.244.2.12
--- php4/ext/pgsql/pgsql.c:1.244.2.11 Fri Mar 7 08:42:16 2003
+++ php4/ext/pgsql/pgsql.c Sun Mar 9 14:15:16 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.244.2.11 2003/03/07 13:42:16 ddhill Exp $ */
+/* $Id: pgsql.c,v 1.244.2.12 2003/03/09 19:15:16 derick Exp $ */
#include stdlib.h
@@ -606,7 +606,7 @@
pgsql = (PGconn *) le-ptr;
}
ZEND_REGISTER_RESOURCE(return_value, pgsql, le_plink);
- } else { // Non persistent connection
+ } else { /* Non persistent connection */
list_entry *index_ptr,new_index_ptr;
/* first we check the hash for the hashed_details key. if it exists,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard basic_functions.c basic_functions.h user_filters.c
pollita Sun Mar 9 18:12:32 2003 EDT
Modified files:
/php4/ext/standard basic_functions.c basic_functions.h
user_filters.c
Log:
Adjustment to user filters reimplementation. Make a bucket an object containing a
resource(the real bucket) and a data element for direct operations. Simplifies
user interface and reduces number of function calls/reallocs needed.
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.594
php4/ext/standard/basic_functions.c:1.595
--- php4/ext/standard/basic_functions.c:1.594 Thu Mar 6 15:31:16 2003
+++ php4/ext/standard/basic_functions.c Sun Mar 9 18:12:31 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.594 2003/03/06 20:31:16 sesser Exp $ */
+/* $Id: basic_functions.c,v 1.595 2003/03/09 23:12:31 pollita Exp $ */
#include php.h
#include php_streams.h
@@ -898,7 +898,6 @@
PHP_FE(stream_bucket_prepend, NULL)
PHP_FE(stream_bucket_append,NULL)
PHP_FE(stream_bucket_new, NULL)
- PHP_FE(stream_bucket, NULL)
/* functions from aggregate.c */
PHP_FE(aggregate,
first_arg_force_ref)
Index: php4/ext/standard/basic_functions.h
diff -u php4/ext/standard/basic_functions.h:1.114
php4/ext/standard/basic_functions.h:1.115
--- php4/ext/standard/basic_functions.h:1.114 Mon Feb 24 16:56:19 2003
+++ php4/ext/standard/basic_functions.h Sun Mar 9 18:12:31 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.h,v 1.114 2003/02/24 21:56:19 pollita Exp $ */
+/* $Id: basic_functions.h,v 1.115 2003/03/09 23:12:31 pollita Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -113,7 +113,6 @@
PHP_FUNCTION(stream_bucket_prepend);
PHP_FUNCTION(stream_bucket_append);
PHP_FUNCTION(stream_bucket_new);
-PHP_FUNCTION(stream_bucket);
PHP_MINIT_FUNCTION(user_filters);
#ifdef PHP_WIN32
Index: php4/ext/standard/user_filters.c
diff -u php4/ext/standard/user_filters.c:1.11 php4/ext/standard/user_filters.c:1.12
--- php4/ext/standard/user_filters.c:1.11 Mon Feb 24 16:56:18 2003
+++ php4/ext/standard/user_filters.cSun Mar 9 18:12:31 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: user_filters.c,v 1.11 2003/02/24 21:56:18 pollita Exp $ */
+/* $Id: user_filters.c,v 1.12 2003/03/09 23:12:31 pollita Exp $ */
/*
* TODO: Rewrite for buckets.
@@ -167,7 +167,7 @@
zval *zclosing, *zconsumed, *zin, *zout, *zstream;
int call_result;
- if (FAILURE == zend_hash_find(Z_OBJPROP_P(obj), stream, 6,
(void**)zstream)) {
+ if (FAILURE == zend_hash_find(Z_OBJPROP_P(obj), stream, 7,
(void**)zstream)) {
/* Give the userfilter class a hook back to the stream */
ALLOC_ZVAL(zstream);
ZEND_REGISTER_RESOURCE(zstream, stream, le_stream);
@@ -322,11 +322,11 @@
{
}
-/* {{{ proto resource stream_bucket_make_writeable(resource brigade)
- Return a bucket from the brigade for operating on */
+/* {{{ proto object stream_bucket_make_writeable(resource brigade)
+ Return a bucket object from the brigade for operating on */
PHP_FUNCTION(stream_bucket_make_writeable)
{
- zval *zbrigade;
+ zval *zbrigade, *zbucket;
php_stream_bucket_brigade *brigade;
php_stream_bucket *bucket;
@@ -339,7 +339,12 @@
ZVAL_NULL(return_value);
if (brigade-head (bucket = php_stream_bucket_make_writeable(brigade-head
TSRMLS_CC))) {
- ZEND_REGISTER_RESOURCE(return_value, bucket, le_bucket);
+ ALLOC_INIT_ZVAL(zbucket);
+ ZEND_REGISTER_RESOURCE(zbucket, bucket, le_bucket);
+ object_init(return_value);
+ add_property_zval(return_value, bucket, zbucket);
+ add_property_stringl(return_value, data, bucket-buf,
bucket-buflen, 1);
+ add_property_long(return_value, datalen, bucket-buflen);
}
}
/* }}} */
@@ -347,16 +352,33 @@
/* {{{ php_stream_bucket_attach */
static void php_stream_bucket_attach(int append, INTERNAL_FUNCTION_PARAMETERS)
{
- zval *zbrigade, *zbucket;
+ zval *zbrigade, *zobject;
+ zval **pzbucket, **pzdata;
php_stream_bucket_brigade *brigade;
php_stream_bucket *bucket;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, zz, zbrigade,
zbucket) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, zo, zbrigade,
zobject) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ if (FAILURE == zend_hash_find(Z_OBJPROP_P(zobject), bucket, 7,
(void**)pzbucket)) {
+
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard/tests/file fopencookie.phpt
shane Sun Mar 9 19:14:11 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard/tests/file fopencookie.phpt
Log:
make test happy by adding missing functions to avoid warnings, taken from
user_stream.c
Index: php4/ext/standard/tests/file/fopencookie.phpt
diff -u php4/ext/standard/tests/file/fopencookie.phpt:1.1.2.2
php4/ext/standard/tests/file/fopencookie.phpt:1.1.2.3
--- php4/ext/standard/tests/file/fopencookie.phpt:1.1.2.2 Thu Nov 14 09:25:36
2002
+++ php4/ext/standard/tests/file/fopencookie.phpt Sun Mar 9 19:14:11 2003
@@ -74,6 +74,48 @@
return false;
}
}
+
+ function stream_write($data)
+ {
+ return false;
+ }
+
+ function stream_close()
+ {
+ }
+
+ function stream_flush()
+ {
+ return false;
+ }
+
+ function stream_stat()
+ {
+ return NULL;
+ }
+
+ function url_stat($url)
+ {
+ return NULL;
+ }
+
+ function dir_opendir($url, $options)
+ {
+ return false;
+ }
+
+ function dir_readdir()
+ {
+ return NULL;
+ }
+
+ function dir_closedir()
+ {
+ }
+
+ function dir_rewinddir()
+ {
+ }
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard/tests/reg 009.phpt
shane Sun Mar 9 20:10:52 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard/tests/reg009.phpt
Log:
splitting on whitespace will be different depending on platform, so be specific with
the line ending.
Index: php4/ext/standard/tests/reg/009.phpt
diff -u php4/ext/standard/tests/reg/009.phpt:1.1
php4/ext/standard/tests/reg/009.phpt:1.1.18.1
--- php4/ext/standard/tests/reg/009.phpt:1.1Sun Aug 27 15:46:00 2000
+++ php4/ext/standard/tests/reg/009.phptSun Mar 9 20:10:52 2003
@@ -4,8 +4,7 @@
--GET--
--FILE--
?php
- $a=split([[:space:]],this is a
-test);
+ $a=split([[:space:]],this is a\ntest);
echo count($a) . \n;
for ($i = 0; $i count($a); $i++) {
echo $a[$i] . \n;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard/tests/strings bug21453.phpt
shane Sun Mar 9 20:23:10 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/standard/tests/stringsbug21453.phpt Log: line endings on win32 made the var_dump'ed string 4 bytes longer. this should work on all platforms. Index: php4/ext/standard/tests/strings/bug21453.phpt diff -u php4/ext/standard/tests/strings/bug21453.phpt:1.1.2.1 php4/ext/standard/tests/strings/bug21453.phpt:1.1.2.2 --- php4/ext/standard/tests/strings/bug21453.phpt:1.1.2.1 Mon Jan 6 17:16:30 2003 +++ php4/ext/standard/tests/strings/bug21453.phpt Sun Mar 9 20:23:10 2003 @@ -8,11 +8,10 @@ trtdsecond cell before second cell after/td/tr /table; - var_dump(strip_tags($test)); + echo strip_tags($test); ? --EXPECT-- -string(80) + first cell before first cell after second cell before second cell after - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/fdf fdf.c
sniper Sun Mar 9 21:10:19 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/fdf fdf.c
Log:
no c++ comments..
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.66.2.3 php4/ext/fdf/fdf.c:1.66.2.4
--- php4/ext/fdf/fdf.c:1.66.2.3 Fri Mar 7 08:42:13 2003
+++ php4/ext/fdf/fdf.c Sun Mar 9 21:10:18 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fdf.c,v 1.66.2.3 2003/03/07 13:42:13 ddhill Exp $ */
+/* $Id: fdf.c,v 1.66.2.4 2003/03/10 02:10:18 sniper Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -1495,12 +1495,12 @@
ZVAL_STRING(z_name, name, 1);
args[0] = z_name;
- if(*value) { // simple value
+ if(*value) { /* simple value */
MAKE_STD_ZVAL(z_value);
ZVAL_STRING(z_value, value, 1);
args[1] = z_value;
- } else { // empty value *might* be an array
- // todo do it like fdf_get_value (or re-implement yourself?)
+ } else { /* empty value *might* be an array */
+ /* todo do it like fdf_get_value (or re-implement yourself?) */
}
if(userdata) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/fdf fdf.c
sniper Sun Mar 9 21:14:09 2003 EDT
Modified files:
/php4/ext/fdf fdf.c
Log:
cs ws fixes
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.73 php4/ext/fdf/fdf.c:1.74
--- php4/ext/fdf/fdf.c:1.73 Thu Mar 6 18:07:23 2003
+++ php4/ext/fdf/fdf.c Sun Mar 9 21:14:09 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fdf.c,v 1.73 2003/03/06 23:07:23 ddhill Exp $ */
+/* $Id: fdf.c,v 1.74 2003/03/10 02:14:09 sniper Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -1478,49 +1478,50 @@
#endif
/* {{{ enum_values_callback */
- static ASBool enum_values_callback(char *name, char *value, void *userdata) {
- zval *retval_ptr, *z_name, *z_value, **args[3];
- long retval = 0;
- int numargs = 2;
- TSRMLS_FETCH();
-
- MAKE_STD_ZVAL(z_name);
- ZVAL_STRING(z_name, name, 1);
- args[0] = z_name;
-
- if(*value) { // simple value
- MAKE_STD_ZVAL(z_value);
- ZVAL_STRING(z_value, value, 1);
- args[1] = z_value;
- } else { // empty value *might* be an array
- // todo do it like fdf_get_value (or re-implement yourself?)
- }
-
- if(userdata) {
- args[2] = (zval **)userdata;
- numargs++;
- }
+static ASBool enum_values_callback(char *name, char *value, void *userdata)
+{
+ zval *retval_ptr, *z_name, *z_value, **args[3];
+ long retval = 0;
+ int numargs = 2;
+ TSRMLS_FETCH();
+
+ MAKE_STD_ZVAL(z_name);
+ ZVAL_STRING(z_name, name, 1);
+ args[0] = z_name;
+
+ if (*value) { /* simple value */
+ MAKE_STD_ZVAL(z_value);
+ ZVAL_STRING(z_value, value, 1);
+ args[1] = z_value;
+ } else { /* empty value *might* be an array */
+ /* TODO: do it like fdf_get_value (or re-implement yourself?) */
+ }
+
+ if (userdata) {
+ args[2] = (zval **) userdata;
+ numargs++;
+ }
- if (call_user_function_ex(EG(function_table),
+ if (call_user_function_ex(EG(function_table),
NULL,
FDF_G(enum_callback),
retval_ptr,
numargs, args,
- 0, NULL
TSRMLS_CC)==SUCCESS
- retval_ptr) {
-
- convert_to_long_ex(retval_ptr);
- retval = Z_LVAL_P(retval_ptr);
- zval_ptr_dtor(retval_ptr);
- } else {
+ 0, NULL TSRMLS_CC) ==
SUCCESS
+retval_ptr) {
+
+ convert_to_long_ex(retval_ptr);
+ retval = Z_LVAL_P(retval_ptr);
+ zval_ptr_dtor(retval_ptr);
+ } else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, callback failed);
- }
+ }
- zval_ptr_dtor(z_name);
- zval_ptr_dtor(z_value);
+ zval_ptr_dtor(z_name);
+ zval_ptr_dtor(z_value);
- return retval;
- }
+ return retval;
+}
/* }}} */
/* {{{ proto bool fdf_enum_values(resource fdfdoc, callback function [, mixed
userdata])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /sapi/cgi cgi_main.c
sniper Sun Mar 9 21:17:06 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/sapi/cgi cgi_main.c
Log:
MFH
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.190.2.16 php4/sapi/cgi/cgi_main.c:1.190.2.17
--- php4/sapi/cgi/cgi_main.c:1.190.2.16 Sat Feb 15 08:26:05 2003
+++ php4/sapi/cgi/cgi_main.cSun Mar 9 21:17:06 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.190.2.16 2003/02/15 13:26:05 edink Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.17 2003/03/10 02:17:06 sniper Exp $ */
#include php.h
#include php_globals.h
@@ -233,6 +233,7 @@
ret = sapi_cgibin_single_write(ptr, remaining TSRMLS_CC);
if (!ret) {
php_handle_aborted_connection();
+ return str_length - remaining;
}
ptr += ret;
remaining -= ret;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard/tests/time mktime.phpt
shane Sun Mar 9 21:40:19 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard/tests/time mktime.phpt
Log:
fix line endings in file
Index: php4/ext/standard/tests/time/mktime.phpt
diff -u php4/ext/standard/tests/time/mktime.phpt:1.1.2.1
php4/ext/standard/tests/time/mktime.phpt:1.1.2.2
--- php4/ext/standard/tests/time/mktime.phpt:1.1.2.1Sun Feb 9 07:11:01 2003
+++ php4/ext/standard/tests/time/mktime.phptSun Mar 9 21:40:19 2003
@@ -1,49 +1,49 @@
---TEST--
-mktime()
---FILE--
-?php
-$timezones = array(
-'GMT',
-'GST-1GDT'
-);
-
-foreach($timezones as $timezone)
-{
-putenv('TZ='.$timezone);
-
-/* status of daylight saving time unknown */
-var_dump(mktime(0, 0, 0, 1, 1, 2002));
-/* status of daylight saving time unknown */
-var_dump(mktime(0, 0, 0, 1, 1, 2002, -1));
-/* daylight saving time is not in affect */
-var_dump(mktime(0, 0, 0, 1, 1, 2002, 0));
-/* daylight saving time is in affect */
-var_dump(mktime(0, 0, 0, 1, 1, 2002, 1));
-
-/* status of daylight saving time unknown */
-var_dump(mktime(0, 0, 0, 7, 1, 2002));
-/* status of daylight saving time unknown */
-var_dump(mktime(0, 0, 0, 7, 1, 2002, -1));
-/* daylight saving time is not in affect */
-var_dump(mktime(0, 0, 0, 7, 1, 2002, 0));
-/* daylight saving time is in affect */
-var_dump(mktime(0, 0, 0, 7, 1, 2002, 1));
-}
-?
---EXPECT--
-int(1009843200)
-int(1009843200)
-int(1009843200)
-int(1009843200)
-int(1025481600)
-int(1025481600)
-int(1025481600)
-int(1025481600)
-int(1009839600)
-int(1009839600)
-int(1009839600)
-int(1009836000)
-int(1025474400)
-int(1025474400)
-int(1025478000)
-int(1025474400)
+--TEST--
+mktime()
+--FILE--
+?php
+$timezones = array(
+'GMT',
+'GST-1GDT'
+);
+
+foreach($timezones as $timezone)
+{
+putenv('TZ='.$timezone);
+
+/* status of daylight saving time unknown */
+var_dump(mktime(0, 0, 0, 1, 1, 2002));
+/* status of daylight saving time unknown */
+var_dump(mktime(0, 0, 0, 1, 1, 2002, -1));
+/* daylight saving time is not in affect */
+var_dump(mktime(0, 0, 0, 1, 1, 2002, 0));
+/* daylight saving time is in affect */
+var_dump(mktime(0, 0, 0, 1, 1, 2002, 1));
+
+/* status of daylight saving time unknown */
+var_dump(mktime(0, 0, 0, 7, 1, 2002));
+/* status of daylight saving time unknown */
+var_dump(mktime(0, 0, 0, 7, 1, 2002, -1));
+/* daylight saving time is not in affect */
+var_dump(mktime(0, 0, 0, 7, 1, 2002, 0));
+/* daylight saving time is in affect */
+var_dump(mktime(0, 0, 0, 7, 1, 2002, 1));
+}
+?
+--EXPECT--
+int(1009843200)
+int(1009843200)
+int(1009843200)
+int(1009843200)
+int(1025481600)
+int(1025481600)
+int(1025481600)
+int(1025481600)
+int(1009839600)
+int(1009839600)
+int(1009839600)
+int(1009836000)
+int(1025474400)
+int(1025474400)
+int(1025478000)
+int(1025474400)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
