[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Sep 21 20:32:22 2003 EDT Modified files: /php-srcChangeLog Log: ChangeLog update Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1394 php-src/ChangeLog:1.1395 --- php-src/ChangeLog:1.1394Sat Sep 20 20:31:58 2003 +++ php-src/ChangeLog Sun Sep 21 20:32:21 2003 @@ -1,3 +1,51 @@ +2003-09-21 Sascha Schumann [EMAIL PROTECTED] + +* (PHP_4_3) + sapi/cgi/cgi_main.c + sapi/cgi/libfcgi/fcgiapp.c + sapi/cgi/libfcgi/os_unix.c + sapi/cgi/libfcgi/os_win32.c + sapi/cgi/libfcgi/include/fastcgi.h + sapi/cgi/libfcgi/include/fcgi_config_win32.h + sapi/cgi/libfcgi/include/fcgi_stdio.h + sapi/cgi/libfcgi/include/fcgiapp.h + sapi/cgi/libfcgi/include/fcgimisc.h + sapi/cgi/libfcgi/include/fcgio.h + sapi/cgi/libfcgi/include/fcgios.h: + Major bug fix upgrade to the bundled libfcgi + + A delta between libfcgi 2.2.2 and 2.4.1-SNAP has been applied to the + source. Shane's impersonation, putenv and exit-return improvements + have been carried over. One of Shane's changes caused the first process + to hang after one request. The modification has been deactived + (os_win32.c). + + These changes together with a patch to mod_fastcgi, make + Apache/mod_fastcgi + and PHP work under Win32. It was basically unusable before that. + +2003-09-21 Marcus Boerger [EMAIL PROTECTED] + +* ext/sqlite/sqlite.c: + - return correct hash constants + - check for 'memory' in sqlite_factory() too (noticed by John Coggeshal) + +2003-09-21 Wez Furlong [EMAIL PROTECTED] + +* ext/openssl/xp_ssl.c: + Merge remaining code from 4.3 to fix #22238 in HEAD. + +2003-09-21 Uwe Steinmann [EMAIL PROTECTED] + +* ext/dbase/dbase.c: + - fixed typo in error message + +2003-09-21 Sascha Schumann [EMAIL PROTECTED] + +* ext/session/session.c: + Alias session_commit to session_write_close, a more intuitive name + for the functionality. + 2003-09-20 Sascha Schumann [EMAIL PROTECTED] * ext/standard/string.c:
[PHP-CVS] cvs: php-src /ext/session session.c
sas Sun Sep 21 07:53:13 2003 EDT
Modified files:
/php-src/ext/sessionsession.c
Log:
Alias session_commit to session_write_close, a more intuitive name
for the functionality.
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.375 php-src/ext/session/session.c:1.376
--- php-src/ext/session/session.c:1.375 Fri Aug 29 08:33:47 2003
+++ php-src/ext/session/session.c Sun Sep 21 07:53:12 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.375 2003/08/29 12:33:47 sas Exp $ */
+/* $Id: session.c,v 1.376 2003/09/21 11:53:12 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -76,6 +76,7 @@
PHP_FE(session_set_cookie_params, NULL)
PHP_FE(session_get_cookie_params, NULL)
PHP_FE(session_write_close, NULL)
+ PHP_FALIAS(session_commit, session_write_close, NULL)
{NULL, NULL, NULL}
};
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Sun Sep 21 09:03:30 2003 EDT Modified files: /CVSROOTavail Log: peclweb karma for john Index: CVSROOT/avail diff -u CVSROOT/avail:1.750 CVSROOT/avail:1.751 --- CVSROOT/avail:1.750 Sat Sep 20 01:50:12 2003 +++ CVSROOT/avail Sun Sep 21 09:03:29 2003 @@ -58,7 +58,7 @@ avail|sroebke,thierry_bo,tony2001,schst|peardoc # access to the newly cut pecl website etc -avail|pajoye,wez,pollita,tal,cox,mj,helly|peclweb,pecl +avail|pajoye,wez,pollita,tal,cox,mj,helly,john|peclweb,pecl # General pecl avail|csilles,t2k269|pecl -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dbase dbase.c
steinm Sun Sep 21 09:17:20 2003 EDT
Modified files:
/php-src/ext/dbase dbase.c
Log:
- fixed typo in error message
Index: php-src/ext/dbase/dbase.c
diff -u php-src/ext/dbase/dbase.c:1.68 php-src/ext/dbase/dbase.c:1.69
--- php-src/ext/dbase/dbase.c:1.68 Thu Aug 28 17:00:13 2003
+++ php-src/ext/dbase/dbase.c Sun Sep 21 09:17:20 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dbase.c,v 1.68 2003/08/28 21:00:13 andrey Exp $ */
+/* $Id: dbase.c,v 1.69 2003/09/21 13:17:20 steinm Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -664,7 +664,7 @@
/* field type */
if (zend_hash_index_find(Z_ARRVAL_PP (field), 1, (void **)value) ==
FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, expected field
type as sececond element of list in field %d, i);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, expected field
type as second element of list in field %d, i);
RETURN_FALSE;
}
convert_to_string_ex(value);
--
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/dbase dbase.c
sniper Sun Sep 21 11:40:29 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/dbase dbase.c
Log:
MFH: typo fix in error message
Index: php-src/ext/dbase/dbase.c
diff -u php-src/ext/dbase/dbase.c:1.60.2.1 php-src/ext/dbase/dbase.c:1.60.2.2
--- php-src/ext/dbase/dbase.c:1.60.2.1 Tue Dec 31 11:34:20 2002
+++ php-src/ext/dbase/dbase.c Sun Sep 21 11:40:28 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dbase.c,v 1.60.2.1 2002/12/31 16:34:20 sebastian Exp $ */
+/* $Id: dbase.c,v 1.60.2.2 2003/09/21 15:40:28 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -674,7 +674,7 @@
/* field type */
if (zend_hash_index_find(Z_ARRVAL_PP (field), 1, (void **)value) ==
FAILURE) {
- php_error(E_WARNING, expected field type as sececond element
of list in field %d, i);
+ php_error(E_WARNING, expected field type as second element of
list in field %d, i);
RETURN_FALSE;
}
convert_to_string_ex(value);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c
helly Sun Sep 21 15:36:41 2003 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
- return correct hash constants
- check for 'memory' in sqlite_factory() too (noticed by John Coggeshal)
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.95 php-src/ext/sqlite/sqlite.c:1.96
--- php-src/ext/sqlite/sqlite.c:1.95Sat Sep 13 06:31:06 2003
+++ php-src/ext/sqlite/sqlite.c Sun Sep 21 15:36:40 2003
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.95 2003/09/13 10:31:06 helly Exp $
+ $Id: sqlite.c,v 1.96 2003/09/21 19:36:40 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -757,7 +757,7 @@
static int sqlite_free_persistent(list_entry *le, void *ptr TSRMLS_DC)
{
- return le-ptr == ptr;
+ return le-ptr == ptr ? ZEND_HASH_APPLY_REMOVE : ZEND_HASH_APPLY_KEEP;
}
static void sqlite_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
@@ -944,7 +944,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.95 2003/09/13 10:31:06 helly Exp $);
+ php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.96 2003/09/21 19:36:40 helly Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -1172,14 +1172,16 @@
zval_dtor(errmsg);
}
- if (PG(safe_mode) (!php_checkuid(filename, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- php_std_error_handling();
- RETURN_NULL();
- }
-
- if (php_check_open_basedir(filename TSRMLS_CC)) {
- php_std_error_handling();
- RETURN_NULL();
+ if (strncmp(filename, :memory:, sizeof(:memory:) - 1)) {
+ if (PG(safe_mode) (!php_checkuid(filename, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
+ php_std_error_handling();
+ RETURN_NULL();
+ }
+
+ if (php_check_open_basedir(filename TSRMLS_CC)) {
+ php_std_error_handling();
+ RETURN_NULL();
+ }
}
php_sqlite_open(filename, mode, NULL, return_value, errmsg, return_value
TSRMLS_CC);
--
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) /sapi/cgi cgi_main.c /sapi/cgi/libfcgi fcgiapp.c os_unix.c os_win32.c /sapi/cgi/libfcgi/include fastcgi.h fcgi_config_win32.h fcgi_stdio.h fcgiapp.h fcgimisc.h fcgio.h fcgios.h
sas Sun Sep 21 18:08:18 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/cgi cgi_main.c
/php-src/sapi/cgi/libfcgi fcgiapp.c os_unix.c os_win32.c
/php-src/sapi/cgi/libfcgi/include fastcgi.h fcgi_config_win32.h
fcgi_stdio.h fcgiapp.h fcgimisc.h
fcgio.h fcgios.h
Log:
Major bug fix upgrade to the bundled libfcgi
A delta between libfcgi 2.2.2 and 2.4.1-SNAP has been applied to the
source. Shane's impersonation, putenv and exit-return improvements
have been carried over. One of Shane's changes caused the first process
to hang after one request. The modification has been deactived (os_win32.c).
These changes together with a patch to mod_fastcgi, make Apache/mod_fastcgi
and PHP work under Win32. It was basically unusable before that.
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.48 php-src/sapi/cgi/cgi_main.c:1.190.2.49
--- php-src/sapi/cgi/cgi_main.c:1.190.2.48 Wed Sep 3 04:14:14 2003
+++ php-src/sapi/cgi/cgi_main.c Sun Sep 21 18:08:13 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.190.2.48 2003/09/03 08:14:14 sas Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.49 2003/09/21 22:08:13 sas Exp $ */
#include php.h
#include php_globals.h
@@ -218,13 +218,8 @@
#define STDOUT_FILENO 1
#endif
-static inline size_t sapi_cgibin_single_write(const char *str, uint str_length
TSRMLS_DC)
+static size_t sapi_cgibin_single_write(const char *str, uint str_length TSRMLS_DC)
{
-#ifdef PHP_WRITE_STDOUT
- long ret;
-#else
- size_t ret;
-#endif
#if PHP_FASTCGI
if (!FCGX_IsCGI()) {
@@ -236,13 +231,22 @@
return ret;
}
#endif
+
#ifdef PHP_WRITE_STDOUT
- ret = write(STDOUT_FILENO, str, str_length);
- if (ret = 0) return 0;
- return ret;
+ {
+ long ret;
+
+ ret = write(STDOUT_FILENO, str, str_length);
+ if (ret = 0) return 0;
+ return ret;
+ }
#else
- ret = fwrite(str, 1, MIN(str_length, 16384), stdout);
- return ret;
+ {
+ size_t ret;
+
+ ret = fwrite(str, 1, MIN(str_length, 16384), stdout);
+ return ret;
+ }
#endif
}
Index: php-src/sapi/cgi/libfcgi/fcgiapp.c
diff -u php-src/sapi/cgi/libfcgi/fcgiapp.c:1.1.4.1
php-src/sapi/cgi/libfcgi/fcgiapp.c:1.1.4.2
--- php-src/sapi/cgi/libfcgi/fcgiapp.c:1.1.4.1 Sun Dec 1 18:11:14 2002
+++ php-src/sapi/cgi/libfcgi/fcgiapp.c Sun Sep 21 18:08:16 2003
@@ -11,7 +11,7 @@
*
*/
#ifndef lint
-static const char rcsid[] = $Id: fcgiapp.c,v 1.1.4.1 2002/12/01 23:11:14 shane Exp
$;
+static const char rcsid[] = $Id: fcgiapp.c,v 1.1.4.2 2003/09/21 22:08:16 sas Exp $;
#endif /* not lint */
#include assert.h
@@ -70,7 +70,6 @@
static int isFastCGI = -1;
static char *webServerAddressList = NULL;
static FCGX_Request the_request;
-void _FCGX_FreeStream(FCGX_Stream **streamPtr, int freeData);
void FCGX_ShutdownPending(void)
{
@@ -108,14 +107,20 @@
*/
int FCGX_GetChar(FCGX_Stream *stream)
{
-if(stream-rdNext != stream-stop)
-return *stream-rdNext++;
-if(stream-isClosed || !stream-isReader)
+if (stream-isClosed || ! stream-isReader)
return EOF;
+
+if (stream-rdNext != stream-stop)
+return *stream-rdNext++;
+
stream-fillBuffProc(stream);
+if (stream-isClosed)
+return EOF;
+
stream-stopUnget = stream-rdNext;
-if(stream-rdNext != stream-stop)
+if (stream-rdNext != stream-stop)
return *stream-rdNext++;
+
ASSERT(stream-isClosed); /* bug in fillBufProc if not */
return EOF;
}
@@ -139,7 +144,7 @@
{
int m, bytesMoved;
-if(n = 0) {
+if (stream-isClosed || ! stream-isReader || n = 0) {
return 0;
}
/*
@@ -164,10 +169,13 @@
if(bytesMoved == n)
return bytesMoved;
str += m;
- }
+}
if(stream-isClosed || !stream-isReader)
return bytesMoved;
stream-fillBuffProc(stream);
+if (stream-isClosed)
+return bytesMoved;
+
stream-stopUnget = stream-rdNext;
}
}
@@ -938,8 +946,9 @@
*/
if(stream-FCGI_errno == 0) {
stream-FCGI_errno = FCGI_errno;
-stream-isClosed = TRUE;
}
+
+stream-isClosed = TRUE;
}
/*
@@ -980,7 +989,18 @@
*/
}
+/*
+ * A vector of pointers representing the parameters received
+ * by a FastCGI application server, with the vector's length
+ * and last valid element so adding new parameters is efficient.
+ */
+typedef struct Params {
+FCGX_ParamArray vec;/* vector of strings */
+int length; /* number of string vec can hold */
+char **cur; /* current item in vec; *cur == NULL */
+} Params;
+typedef
[PHP-CVS] cvs: php-src /ext/standard info.c
iliaa Mon Sep 22 00:18:24 2003 EDT
Modified files:
/php-src/ext/standard info.c
Log:
String formatting stuff.
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.238 php-src/ext/standard/info.c:1.239
--- php-src/ext/standard/info.c:1.238 Thu Jun 19 12:10:54 2003
+++ php-src/ext/standard/info.c Mon Sep 22 00:18:24 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.238 2003/06/19 16:10:54 iliaa Exp $ */
+/* $Id: info.c,v 1.239 2003/09/22 04:18:24 iliaa Exp $ */
#include php.h
#include php_ini.h
@@ -81,7 +81,7 @@
php_printf(%s, module-name);
php_printf(/td/tr\n);
} else {
- php_printf(module-name);
+ php_printf(%s, module-name);
php_printf(\n);
}
}
--
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/standard info.c
iliaa Mon Sep 22 00:18:40 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard info.c
Log:
MFH: String formating.
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.218.2.13 php-src/ext/standard/info.c:1.218.2.14
--- php-src/ext/standard/info.c:1.218.2.13 Thu Jun 19 12:43:41 2003
+++ php-src/ext/standard/info.c Mon Sep 22 00:18:39 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.218.2.13 2003/06/19 16:43:41 iliaa Exp $ */
+/* $Id: info.c,v 1.218.2.14 2003/09/22 04:18:39 iliaa Exp $ */
#include php.h
#include php_ini.h
@@ -81,7 +81,7 @@
php_printf(%s, module-name);
php_printf(/td/tr\n);
} else {
- php_printf(module-name);
+ php_printf(%s, module-name);
php_printf(\n);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
