[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard file.c
hholzgraFri Feb 28 03:43:51 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/standard file.c Log: MFphp5 Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.279.2.12 php4/ext/standard/file.c:1.279.2.13 --- php4/ext/standard/file.c:1.279.2.12 Mon Feb 24 17:48:39 2003 +++ php4/ext/standard/file.cFri Feb 28 03:43:51 2003 @@ -21,7 +21,7 @@ +--+ */ -/* $Id: file.c,v 1.279.2.12 2003/02/24 22:48:39 moriyoshi Exp $ */ +/* $Id: file.c,v 1.279.2.13 2003/02/28 08:43:51 hholzgra Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -112,6 +112,9 @@ #endif #ifdef HAVE_FNMATCH +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif #include fnmatch.h #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4) /ext/standard file.c
hholzgraFri Feb 28 03:44:35 2003 EDT Modified files: (Branch: PHP_4) /php4/ext/standard file.c Log: MFphp5 Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.279.2.6 php4/ext/standard/file.c:1.279.2.6.2.1 --- php4/ext/standard/file.c:1.279.2.6 Thu Jan 9 18:09:41 2003 +++ php4/ext/standard/file.cFri Feb 28 03:44:35 2003 @@ -21,7 +21,7 @@ +--+ */ -/* $Id: file.c,v 1.279.2.6 2003/01/09 23:09:41 iliaa Exp $ */ +/* $Id: file.c,v 1.279.2.6.2.1 2003/02/28 08:44:35 hholzgra Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -112,6 +112,9 @@ #endif #ifdef HAVE_FNMATCH +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif #include fnmatch.h #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
sniper Fri Feb 28 05:23:05 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: BFN Index: php4/NEWS diff -u php4/NEWS:1.1247.2.116 php4/NEWS:1.1247.2.117 --- php4/NEWS:1.1247.2.116 Fri Feb 28 02:35:58 2003 +++ php4/NEWS Fri Feb 28 05:23:05 2003 @@ -23,6 +23,7 @@ - Fixed several errors in hwapi extension. Objects weren't handled properly. (Uwe) - Fixed bug #22402 (opening of ftp for read/write could fail due to invalid return code handling). (Ilia) +- Fixed bug #22384 (FNM_CASEFOLD is not available). (Hartmut) - Fixed bug #22382 (fgetcsv() did not handle \ correctly). (Ilia) - Fixed bug #22376 (wrong httpd.conf modified when using INSTALL_ROOT). (Jani) - Fixed bug #22363 (combinations of fwrite(), fread() and fseek() produce -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /scripts/ext_skel_ng TODO
hholzgraFri Feb 28 05:30:41 2003 EDT Modified files: /php4/scripts/ext_skel_ng TODO Log: callbacks are now supported (although there's still room for improvements) Index: php4/scripts/ext_skel_ng/TODO diff -u php4/scripts/ext_skel_ng/TODO:1.1 php4/scripts/ext_skel_ng/TODO:1.2 --- php4/scripts/ext_skel_ng/TODO:1.1 Mon Feb 24 05:57:48 2003 +++ php4/scripts/ext_skel_ng/TODO Fri Feb 28 05:30:40 2003 @@ -12,5 +12,4 @@ - requirements (see also confing.m4) - protos - resource type specification - - object type specification - - callable types \ No newline at end of file + - object type specification \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
moriyoshi Fri Feb 28 08:32:46 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: Was actually an ucwords() problem... Index: php4/NEWS diff -u php4/NEWS:1.1247.2.117 php4/NEWS:1.1247.2.118 --- php4/NEWS:1.1247.2.117 Fri Feb 28 05:23:05 2003 +++ php4/NEWS Fri Feb 28 08:32:46 2003 @@ -72,7 +72,7 @@ - Fixed bug #21809 (select would not always timeout during socket shutdown). (Wez) - Fixed bug #21725 (return behaviour differs between include and require). (Zeev) - Fixed bug #21713 (include remote files leaks descriptors on Solaris). (Wez) -- Fixed bug #21708 (ucfirst() trouble again). (Moriyoshi) +- Fixed bug #21708 (ucwords() trouble again). (Moriyoshi) - Fixed bug #21689 (fgetcsv() suppresses some characters before a separator). (Masahiro, Moriyoshi) - Fixed bug #21912, #21676 (GetImageSize() failed for remote files). (Wez) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/openssl openssl.c
iliaa Fri Feb 28 12:23:48 2003 EDT
Modified files:
/php4/ext/openssl openssl.c
Log:
Fixed compiler warnings.
Index: php4/ext/openssl/openssl.c
diff -u php4/ext/openssl/openssl.c:1.67 php4/ext/openssl/openssl.c:1.68
--- php4/ext/openssl/openssl.c:1.67 Thu Feb 27 13:16:34 2003
+++ php4/ext/openssl/openssl.c Fri Feb 28 12:23:45 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.67 2003/02/27 18:16:34 wez Exp $ */
+/* $Id: openssl.c,v 1.68 2003/02/28 17:23:45 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1922,7 +1922,7 @@
long key_resource = -1;
EVP_PKEY * key;
BIO * bio_out = NULL;
- EVP_CIPHER * cipher;
+ const EVP_CIPHER * cipher;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, zs|s!a!, zpkey,
filename, filename_len, passphrase, passphrase_len, args) == FAILURE) {
return;
@@ -1977,7 +1977,7 @@
long key_resource = -1;
EVP_PKEY * key;
BIO * bio_out = NULL;
- EVP_CIPHER * cipher;
+ const EVP_CIPHER * cipher;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, zz|s!a!, zpkey, out,
passphrase, passphrase_len, args) == FAILURE) {
return;
@@ -2191,7 +2191,7 @@
HashPosition hpos;
zval ** zcertval;
X509 * cert;
- EVP_CIPHER *cipher = NULL;
+ const EVP_CIPHER *cipher = NULL;
long cipherid = PHP_OPENSSL_CIPHER_DEFAULT;
uint strindexlen;
ulong intindex;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard php_fopen_wrapper.c
iliaa Fri Feb 28 12:26:28 2003 EDT
Modified files:
/php4/ext/standard php_fopen_wrapper.c
Log:
Fixed compiler warnings.
Index: php4/ext/standard/php_fopen_wrapper.c
diff -u php4/ext/standard/php_fopen_wrapper.c:1.34
php4/ext/standard/php_fopen_wrapper.c:1.35
--- php4/ext/standard/php_fopen_wrapper.c:1.34 Thu Feb 20 15:05:31 2003
+++ php4/ext/standard/php_fopen_wrapper.c Fri Feb 28 12:26:28 2003
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_fopen_wrapper.c,v 1.34 2003/02/20 20:05:31 pollita Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.35 2003/02/28 17:26:28 iliaa Exp $ */
#include stdio.h
#include stdlib.h
@@ -129,14 +129,14 @@
p = php_strtok_r(filterlist, |, token);
while (p) {
if (read_chain) {
- if (temp_filter = php_stream_filter_create(p, , 0,
php_stream_is_persistent(stream) TSRMLS_CC)) {
+ if ((temp_filter = php_stream_filter_create(p, , 0,
php_stream_is_persistent(stream) TSRMLS_CC))) {
php_stream_filter_append(stream-readfilters,
temp_filter);
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
create filter (%s)\n, p);
}
}
if (write_chain) {
- if (temp_filter = php_stream_filter_create(p, , 0,
php_stream_is_persistent(stream) TSRMLS_CC)) {
+ if ((temp_filter = php_stream_filter_create(p, , 0,
php_stream_is_persistent(stream) TSRMLS_CC))) {
php_stream_filter_append(stream-writefilters,
temp_filter);
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
create filter (%s)\n, p);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Fri Feb 28 13:46:46 2003 EDT Modified files: /CVSROOTavail Log: Karma Index: CVSROOT/avail diff -u CVSROOT/avail:1.599 CVSROOT/avail:1.600 --- CVSROOT/avail:1.599 Wed Feb 26 19:35:53 2003 +++ CVSROOT/avail Fri Feb 28 13:46:46 2003 @@ -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|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,shuric,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,svbegg,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jedi,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|phpfi,php3,php4,phpdoc,pear,peardoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh +avail|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,shuric,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,svbegg,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jedi,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|phpfi,php3,php4,phpdoc,pear,peardoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh # People who work on the Engine @@ -26,7 +26,7 @@ # The PHP Documentation Group maintains the documentation and its # translations.
[PHP-CVS] cvs: php4 / NEWS configure.in /ext/ftp ftp.c /ext/openssl xp_ssl.c /ext/standard basic_functions.c file.c file.h fsock.c streamsfuncs.c /main network.c php_network.h /main/streams php_stream_transport.h transports.c xp_socket.c
wez Fri Feb 28 14:53:21 2003 EDT
Modified files:
/php4 NEWS configure.in
/php4/ext/ftp ftp.c
/php4/ext/openssl xp_ssl.c
/php4/ext/standard basic_functions.c file.c file.h fsock.c
streamsfuncs.c
/php4/main network.c php_network.h
/php4/main/streams php_stream_transport.h transports.c xp_socket.c
Log:
New user-space functions:
. stream_socket_client() - similar to fsockopen(), but more powerful.
. stream_socket_server() - Creates a server socket.
. stream_socket_accept() - Accept a client connection.
. stream_socket_get_name() - Get local or remote name of socket.
Tidy up some leaks and debug printfs.
Move more streams functions into streamsfuncs.c and streamsfuncs.h.
Index: php4/NEWS
diff -u php4/NEWS:1.1361 php4/NEWS:1.1362
--- php4/NEWS:1.1361Thu Feb 27 10:52:38 2003
+++ php4/NEWS Fri Feb 28 14:53:19 2003
@@ -21,8 +21,16 @@
of the specified parameters to be passed as extra parameters to the sendmail
binary. These parameters will always replace the value of the 5th parameter
to mail(), even in safe mode. (Derick)
+- Added new transport layer for sockets and associated functions. (Wez)
+ . stream_socket_client() - similar to fsockopen(), but more powerful.
+ . stream_socket_server() - Creates a server socket.
+ . stream_socket_accept() - Accept a client connection.
+ . stream_socket_get_name() - Get local or remote name of socket.
+ . generic crypto interface for streams (supports dynamic loading of OpenSSL)
+- Added memory mapping support under win32 to improve performance of
+ readfile(), fpassthru() and some internal streams operations. (Wez)
- Added DBA handler 'inifile' to support ini files. (Marcus)
-- Added filter support. See README.input_filter. (Rasmus)
+- Added input filter support. See README.input_filter. (Rasmus)
- Added session.hash_function and session.hash_bits_per_character. (Sascha)
- Added lightweight streaming input abstraction to the Zend Engine scanners
that provides uniform support for include()'ing data from PHP streams across
Index: php4/configure.in
diff -u php4/configure.in:1.427 php4/configure.in:1.428
--- php4/configure.in:1.427 Thu Feb 27 12:43:36 2003
+++ php4/configure.in Fri Feb 28 14:53:19 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.427 2003/02/27 17:43:36 wez Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.428 2003/02/28 19:53:19 wez Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -461,6 +461,8 @@
getrusage \
gettimeofday \
gmtime_r \
+inet_ntoa \
+inet_ntop \
isascii \
link \
localtime_r \
Index: php4/ext/ftp/ftp.c
diff -u php4/ext/ftp/ftp.c:1.81 php4/ext/ftp/ftp.c:1.82
--- php4/ext/ftp/ftp.c:1.81 Fri Feb 28 02:25:14 2003
+++ php4/ext/ftp/ftp.c Fri Feb 28 14:53:19 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ftp.c,v 1.81 2003/02/28 07:25:14 sniper Exp $ */
+/* $Id: ftp.c,v 1.82 2003/02/28 19:53:19 wez Exp $ */
#include php.h
@@ -135,7 +135,9 @@
tv.tv_sec = timeout_sec;
tv.tv_usec = 0;
- ftp-fd = php_hostconnect(host, (unsigned short) (port ? port : 21),
SOCK_STREAM, tv TSRMLS_CC);
+ ftp-fd = php_network_connect_socket_to_host(host,
+ (unsigned short) (port ? port : 21), SOCK_STREAM,
+ 0, tv, NULL, NULL TSRMLS_CC);
if (ftp-fd == -1) {
goto bail;
}
Index: php4/ext/openssl/xp_ssl.c
diff -u php4/ext/openssl/xp_ssl.c:1.3 php4/ext/openssl/xp_ssl.c:1.4
--- php4/ext/openssl/xp_ssl.c:1.3 Fri Feb 28 02:25:14 2003
+++ php4/ext/openssl/xp_ssl.c Fri Feb 28 14:53:20 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_ssl.c,v 1.3 2003/02/28 07:25:14 sniper Exp $ */
+/* $Id: xp_ssl.c,v 1.4 2003/02/28 19:53:20 wez Exp $ */
#include php.h
#include ext/standard/file.h
@@ -288,7 +288,6 @@
method = TLSv1_server_method();
break;
default:
- printf(unknown method\n);
return -1;
}
@@ -307,19 +306,16 @@
}
if (!SSL_set_fd(sslsock-ssl_handle, sslsock-s.socket)) {
- printf(failed to set fd %d\n, sslsock-s.socket);
handle_ssl_error(stream, 0 TSRMLS_CC);
}
if (cparam-inputs.session) {
- printf(sess=%p\n, cparam-inputs.session);
if (cparam-inputs.session-ops != php_openssl_socket_ops) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, supplied session
stream must be an SSL enabled stream);
} else {
SSL_copy_session_id(sslsock-ssl_handle,
((php_openssl_netstream_data_t*)cparam-inputs.session-abstract)-ssl_handle);
}
[PHP-CVS] cvs: php4 /ext/standard streamsfuncs.h
wez Fri Feb 28 15:06:05 2003 EDT Added files: /php4/ext/standard streamsfuncs.h Log: Add this file... Index: php4/ext/standard/streamsfuncs.h +++ php4/ext/standard/streamsfuncs.h /* +--+ | PHP Version 4| +--+ | Copyright (c) 1997-2003 The PHP Group| +--+ | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is| | available at through the world-wide-web at | | http://www.php.net/license/2_02.txt. | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | [EMAIL PROTECTED] so we can mail you a copy immediately. | +--+ | Authors: Wez Furlong [EMAIL PROTECTED] | +--+ */ /* $Id: streamsfuncs.h,v 1.1 2003/02/28 20:06:05 wez Exp $ */ /* Flags for stream_socket_client */ #define PHP_STREAM_CLIENT_PERSISTENT1 #define PHP_STREAM_CLIENT_ASYNC_CONNECT 2 PHP_FUNCTION(stream_socket_client); PHP_FUNCTION(stream_socket_server); PHP_FUNCTION(stream_socket_accept); PHP_FUNCTION(stream_socket_get_name); PHP_FUNCTION(set_socket_blocking); /* deprecated */ PHP_FUNCTION(stream_set_blocking); PHP_FUNCTION(stream_select); PHP_FUNCTION(stream_set_timeout); PHP_FUNCTION(stream_set_write_buffer); PHP_FUNCTION(stream_get_wrappers); PHP_FUNCTION(stream_get_line); PHP_FUNCTION(stream_get_meta_data); PHP_FUNCTION(stream_register_wrapper); PHP_FUNCTION(stream_context_create); PHP_FUNCTION(stream_context_set_params); PHP_FUNCTION(stream_context_set_option); PHP_FUNCTION(stream_context_get_options); PHP_FUNCTION(stream_filter_prepend); PHP_FUNCTION(stream_filter_append); /* * Local variables: * tab-width: 4 * c-basic-offset: 4 * End: * vim600: noet sw=4 ts=4 fdm=marker * vim600: noet sw=4 ts=4 */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /main php_ini.c
rasmus Fri Feb 28 15:44:47 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main php_ini.c
Log:
@- Crash bug fix. If config-file-scan-dir is set and contains .ini files
but there is no top php.ini file, we would get a segfault. (Rasmus)
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.106.2.6 php4/main/php_ini.c:1.106.2.7
--- php4/main/php_ini.c:1.106.2.6 Wed Feb 19 04:28:37 2003
+++ php4/main/php_ini.c Fri Feb 28 15:44:47 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.106.2.6 2003/02/19 09:28:37 sniper Exp $ */
+/* $Id: php_ini.c,v 1.106.2.7 2003/02/28 20:44:47 rasmus Exp $ */
/* Check CWD for php.ini */
#define INI_CHECK_CWD
@@ -415,6 +415,7 @@
if (S_ISREG(sb.st_mode)) {
if ((fh.handle.fp =
VCWD_FOPEN(ini_file, r))) {
fh.filename = ini_file;
+ fh.type = ZEND_HANDLE_FP;
zend_parse_ini_file(fh, 1,
php_config_ini_parser_cb, extension_lists);
/* Here, add it to the list of
ini files read */
l = strlen(ini_file);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /main php_ini.c
rasmus Fri Feb 28 15:48:38 2003 EDT
Modified files:
/php4/main php_ini.c
Log:
MFB config-file-scan-dir crash fix
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.116 php4/main/php_ini.c:1.117
--- php4/main/php_ini.c:1.116 Wed Feb 19 04:38:11 2003
+++ php4/main/php_ini.c Fri Feb 28 15:48:38 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.116 2003/02/19 09:38:11 sniper Exp $ */
+/* $Id: php_ini.c,v 1.117 2003/02/28 20:48:38 rasmus Exp $ */
/* Check CWD for php.ini */
#define INI_CHECK_CWD
@@ -447,6 +447,7 @@
if (S_ISREG(sb.st_mode)) {
if ((fh.handle.fp =
VCWD_FOPEN(ini_file, r))) {
fh.filename = ini_file;
+ fh.type = ZEND_HANDLE_FP;
zend_parse_ini_file(fh, 1,
php_config_ini_parser_cb, extension_lists);
/* Here, add it to the list of
ini files read */
l = strlen(ini_file);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/ftp ftp.c ftp.h /ext/standard streamsfuncs.c /main network.c php_network.h /main/streams xp_socket.c /win32 select.c
wez Fri Feb 28 16:03:37 2003 EDT
Modified files:
/php4/ext/ftp ftp.c ftp.h
/php4/ext/standard streamsfuncs.c
/php4/main network.c php_network.h
/php4/main/streams xp_socket.c
/php4/win32 select.c
Log:
Tidy up stupid signed/unsigned issues with win32 by introducing a php_socket_t
typedef.
Index: php4/ext/ftp/ftp.c
diff -u php4/ext/ftp/ftp.c:1.82 php4/ext/ftp/ftp.c:1.83
--- php4/ext/ftp/ftp.c:1.82 Fri Feb 28 14:53:19 2003
+++ php4/ext/ftp/ftp.c Fri Feb 28 16:03:35 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ftp.c,v 1.82 2003/02/28 19:53:19 wez Exp $ */
+/* $Id: ftp.c,v 1.83 2003/02/28 21:03:35 wez Exp $ */
#include php.h
@@ -86,9 +86,9 @@
const char *args);
/* wrapper around send/recv to handle timeouts */
-static int my_send(ftpbuf_t *ftp, int s, void *buf, size_t len);
-static int my_recv(ftpbuf_t *ftp, int s, void *buf, size_t len);
-static int my_accept(ftpbuf_t *ftp, int s, struct sockaddr *addr,
+static int my_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len);
+static int my_recv(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len);
+static int my_accept(ftpbuf_t *ftp, php_socket_t s, struct sockaddr *addr,
int *addrlen);
/* reads a line the socket , returns true on success, false on error */
@@ -1173,7 +1173,7 @@
/* {{{ my_send
*/
int
-my_send(ftpbuf_t *ftp, int s, void *buf, size_t len)
+my_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len)
{
fd_set write_set;
struct timeval tv;
@@ -1225,7 +1225,7 @@
/* {{{ my_recv
*/
int
-my_recv(ftpbuf_t *ftp, int s, void *buf, size_t len)
+my_recv(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len)
{
fd_set read_set;
struct timeval tv;
@@ -1265,7 +1265,7 @@
/* {{{ data_available
*/
int
-data_available(ftpbuf_t *ftp, int s)
+data_available(ftpbuf_t *ftp, php_socket_t s)
{
fd_set read_set;
struct timeval tv;
@@ -1292,7 +1292,7 @@
/* {{{ data_writeable
*/
int
-data_writeable(ftpbuf_t *ftp, int s)
+data_writeable(ftpbuf_t *ftp, php_socket_t s)
{
fd_set write_set;
struct timeval tv;
@@ -1320,7 +1320,7 @@
/* {{{ my_accept
*/
int
-my_accept(ftpbuf_t *ftp, int s, struct sockaddr *addr, int *addrlen)
+my_accept(ftpbuf_t *ftp, php_socket_t s, struct sockaddr *addr, int *addrlen)
{
fd_set accept_set;
struct timeval tv;
Index: php4/ext/ftp/ftp.h
diff -u php4/ext/ftp/ftp.h:1.36 php4/ext/ftp/ftp.h:1.37
--- php4/ext/ftp/ftp.h:1.36 Thu Jan 30 23:54:57 2003
+++ php4/ext/ftp/ftp.h Fri Feb 28 16:03:35 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ftp.h,v 1.36 2003/01/31 04:54:57 pollita Exp $ */
+/* $Id: ftp.h,v 1.37 2003/02/28 21:03:35 wez Exp $ */
#ifndefFTP_H
#defineFTP_H
@@ -46,7 +46,7 @@
typedef struct databuf
{
int listener; /* listener socket */
- int fd; /* data connection */
+ php_socket_tfd; /* data connection */
ftptype_t type; /* transfer type */
charbuf[FTP_BUFSIZE]; /* data buffer */
#if HAVE_OPENSSL_EXT
@@ -57,7 +57,7 @@
typedef struct ftpbuf
{
- int fd; /* control connection */
+ php_socket_tfd; /* control connection */
php_sockaddr_storagelocaladdr; /* local address */
int resp; /* last response code */
charinbuf[FTP_BUFSIZE]; /* last response text */
Index: php4/ext/standard/streamsfuncs.c
diff -u php4/ext/standard/streamsfuncs.c:1.2 php4/ext/standard/streamsfuncs.c:1.3
--- php4/ext/standard/streamsfuncs.c:1.2Fri Feb 28 14:53:20 2003
+++ php4/ext/standard/streamsfuncs.cFri Feb 28 16:03:35 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.2 2003/02/28 19:53:20 wez Exp $ */
+/* $Id: streamsfuncs.c,v 1.3 2003/02/28 21:03:35 wez Exp $ */
#include php.h
#include php_globals.h
@@ -28,10 +28,13 @@
#include ext/standard/basic_functions.h
#include php_ini.h
#include streamsfuncs.h
-
+#include php_network.h
+#include php_string.h
#ifndef PHP_WIN32
#define php_select(m, r, w, e, t) select(m, r, w, e, t)
+#else
+#include win32/select.h
#endif
static php_stream_context *decode_context_param(zval *contextresource TSRMLS_DC);
@@ -342,11 +345,11 @@
/* }}} */
/* {{{ stream_select related functions */
-static int stream_array_to_fd_set(zval *stream_array, fd_set *fds, int *max_fd
[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd gd.c
pajoye Fri Feb 28 20:15:33 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/gdgd.c
Log:
MFH imageistruecolor, imagesavealpha
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.221.2.12 php4/ext/gd/gd.c:1.221.2.13
--- php4/ext/gd/gd.c:1.221.2.12 Fri Jan 24 14:24:01 2003
+++ php4/ext/gd/gd.cFri Feb 28 20:15:32 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.221.2.12 2003/01/24 19:24:01 iliaa Exp $ */
+/* $Id: gd.c,v 1.221.2.13 2003/03/01 01:15:32 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -148,11 +148,13 @@
PHP_FE(imagecreate,
NULL)
#if HAVE_LIBGD20
PHP_FE(imagecreatetruecolor,NULL)
+ PHP_FE(imageistruecolor,NULL)
PHP_FE(imagetruecolortopalette, NULL)
PHP_FE(imagesetthickness, NULL)
PHP_FE(imagefilledarc, NULL)
PHP_FE(imagefilledellipse, NULL)
PHP_FE(imagealphablending, NULL)
+ PHP_FE(imagesavealpha, NULL)
PHP_FE(imagecolorresolvealpha, NULL)
PHP_FE(imagecolorclosestalpha, NULL)
PHP_FE(imagecolorexactalpha,NULL)
@@ -711,6 +713,23 @@
}
/* }}} */
+/* {{{ proto int imageistruecolor(int im)
+ *return true if the image uses truecolor */
+PHP_FUNCTION(imageistruecolor)
+{
+ zval **IM;
+ gdImagePtr im;
+
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, IM) == FAILURE) {
+ ZEND_WRONG_PARAM_COUNT();
+ }
+
+ ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd);
+
+ RETURN_BOOL(im-trueColor);
+}
+/* }}} */
+
/* {{{ proto void imagetruecolortopalette(resource im, bool ditherFlag, int
colorsWanted)
Convert a true colour image to a palette based image with a number of colours,
optionally using dithering. */
PHP_FUNCTION(imagetruecolortopalette)
@@ -868,6 +887,27 @@
RETURN_TRUE;
}
/* }}} */
+
+#if HAVE_LIBGD20
+/* {{{ proto void imagesavealpha(resource im, bool on)
+ *Include alpha channel to a saved image */
+PHP_FUNCTION(imagesavealpha)
+{
+ zval **IM, **save;
+ gdImagePtr im;
+
+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, IM,
save) == FAILURE) {
+ ZEND_WRONG_PARAM_COUNT();
+ }
+
+ ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1,
Image, le_gd);
+ convert_to_boolean_ex(save);
+
+ gdImageSaveAlpha(im,
Z_LVAL_PP(save));
+
+ RETURN_TRUE;
+}
+#endif
#if HAVE_GD_BUNDLED
/* {{{ proto void imagelayereffect(resource im, int effect)
--
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/gd php_gd.h
pajoye Fri Feb 28 20:15:47 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/gdphp_gd.h Log: MFH imageistruecolor, imagesavealpha Index: php4/ext/gd/php_gd.h diff -u php4/ext/gd/php_gd.h:1.44.2.2 php4/ext/gd/php_gd.h:1.44.2.3 --- php4/ext/gd/php_gd.h:1.44.2.2 Tue Dec 31 11:34:37 2002 +++ php4/ext/gd/php_gd.hFri Feb 28 20:15:47 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_gd.h,v 1.44.2.2 2002/12/31 16:34:37 sebastian Exp $ */ +/* $Id: php_gd.h,v 1.44.2.3 2003/03/01 01:15:47 pajoye Exp $ */ #ifndef PHP_GD_H #define PHP_GD_H @@ -84,12 +84,14 @@ PHP_FUNCTION(imagefttext); PHP_FUNCTION(imagecreatetruecolor); +PHP_FUNCTION(imageistruecolor); PHP_FUNCTION(imagetruecolortopalette); PHP_FUNCTION(imagesetthickness); PHP_FUNCTION(imageellipse); PHP_FUNCTION(imagefilledellipse); PHP_FUNCTION(imagefilledarc); PHP_FUNCTION(imagealphablending); +PHP_FUNCTION(imagesavealpha); PHP_FUNCTION(imagecolorresolvealpha); PHP_FUNCTION(imagecolorclosestalpha); PHP_FUNCTION(imagecolorexactalpha); -- 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/gd CREDITS
pajoye Fri Feb 28 20:16:01 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/gdCREDITS Log: Update credits Index: php4/ext/gd/CREDITS diff -u php4/ext/gd/CREDITS:1.1 php4/ext/gd/CREDITS:1.1.16.1 --- php4/ext/gd/CREDITS:1.1 Mon Nov 20 05:31:22 2000 +++ php4/ext/gd/CREDITS Fri Feb 28 20:16:00 2003 @@ -1,2 +1,2 @@ GD imaging -Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto +Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, Ilia Alshanetsky, Pierre-Alain Joye -- 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 streamsfuncs.c streamsfuncs.h
wez Fri Feb 28 20:27:50 2003 EDT
Modified files:
/php4/ext/standard basic_functions.c streamsfuncs.c streamsfuncs.h
Log:
Expose php_stream_copy_to_stream as stream_copy_to_stream(); a high
performance alternative to looping reads and writes.
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.592
php4/ext/standard/basic_functions.c:1.593
--- php4/ext/standard/basic_functions.c:1.592 Fri Feb 28 14:53:20 2003
+++ php4/ext/standard/basic_functions.c Fri Feb 28 20:27:50 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.592 2003/02/28 19:53:20 wez Exp $ */
+/* $Id: basic_functions.c,v 1.593 2003/03/01 01:27:50 wez Exp $ */
#include php.h
#include php_streams.h
@@ -683,6 +683,7 @@
PHP_FE(stream_socket_server,
second_and_third_args_force_ref)
PHP_FE(stream_socket_accept,
third_arg_force_ref)
PHP_FE(stream_socket_get_name,
NULL)
+ PHP_FE(stream_copy_to_stream,
NULL)
PHP_FE(fgetcsv,
NULL)
PHP_FE(flock,
NULL)
PHP_FE(get_meta_tags,
NULL)
Index: php4/ext/standard/streamsfuncs.c
diff -u php4/ext/standard/streamsfuncs.c:1.3 php4/ext/standard/streamsfuncs.c:1.4
--- php4/ext/standard/streamsfuncs.c:1.3Fri Feb 28 16:03:35 2003
+++ php4/ext/standard/streamsfuncs.cFri Feb 28 20:27:50 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.3 2003/02/28 21:03:35 wez Exp $ */
+/* $Id: streamsfuncs.c,v 1.4 2003/03/01 01:27:50 wez Exp $ */
#include php.h
#include php_globals.h
@@ -260,6 +260,25 @@
TSRMLS_CC)) {
RETURN_FALSE;
}
+}
+/* }}} */
+
+/* {{{ proto long stream_copy_to_stream(resource source, resource dest [, long maxlen
])
+ Reads up to maxlen bytes from source stream and writes them to dest stream. */
+PHP_FUNCTION(stream_copy_to_stream)
+{
+ php_stream *src, *dest;
+ zval *zsrc, *zdest;
+ long maxlen = PHP_STREAM_COPY_ALL;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rr|l, zsrc, zdest,
maxlen) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ php_stream_from_zval(src, zsrc);
+ php_stream_from_zval(dest, zdest);
+
+ RETURN_LONG(php_stream_copy_to_stream(src, dest, maxlen));
}
/* }}} */
Index: php4/ext/standard/streamsfuncs.h
diff -u php4/ext/standard/streamsfuncs.h:1.1 php4/ext/standard/streamsfuncs.h:1.2
--- php4/ext/standard/streamsfuncs.h:1.1Fri Feb 28 15:06:05 2003
+++ php4/ext/standard/streamsfuncs.hFri Feb 28 20:27:50 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: streamsfuncs.h,v 1.1 2003/02/28 20:06:05 wez Exp $ */
+/* $Id: streamsfuncs.h,v 1.2 2003/03/01 01:27:50 wez Exp $ */
/* Flags for stream_socket_client */
#define PHP_STREAM_CLIENT_PERSISTENT 1
@@ -26,6 +26,8 @@
PHP_FUNCTION(stream_socket_server);
PHP_FUNCTION(stream_socket_accept);
PHP_FUNCTION(stream_socket_get_name);
+
+PHP_FUNCTION(stream_copy_to_stream);
PHP_FUNCTION(set_socket_blocking); /* deprecated */
PHP_FUNCTION(stream_set_blocking);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd CREDITS
pajoye Fri Feb 28 20:28:10 2003 EDT Modified files: /php4/ext/gdCREDITS Log: update credits (ilia,myself) Index: php4/ext/gd/CREDITS diff -u php4/ext/gd/CREDITS:1.1 php4/ext/gd/CREDITS:1.2 --- php4/ext/gd/CREDITS:1.1 Mon Nov 20 05:31:22 2000 +++ php4/ext/gd/CREDITS Fri Feb 28 20:28:10 2003 @@ -1,2 +1,2 @@ GD imaging -Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto +Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, Ilia Alshanetsky, Pierre-Alain Joye -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
wez Fri Feb 28 20:28:50 2003 EDT Modified files: /php4 NEWS Log: New! Index: php4/NEWS diff -u php4/NEWS:1.1362 php4/NEWS:1.1363 --- php4/NEWS:1.1362Fri Feb 28 14:53:19 2003 +++ php4/NEWS Fri Feb 28 20:28:50 2003 @@ -27,6 +27,7 @@ . stream_socket_accept() - Accept a client connection. . stream_socket_get_name() - Get local or remote name of socket. . generic crypto interface for streams (supports dynamic loading of OpenSSL) +- Added stream_copy_to_stream() function. (Wez) - Added memory mapping support under win32 to improve performance of readfile(), fpassthru() and some internal streams operations. (Wez) - Added DBA handler 'inifile' to support ini files. (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
