colder Sun May 4 21:17:33 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c /php-src/ext/ldap ldap.c /php-src/ext/openssl openssl.c /php-src/ext/standard file.c streamsfuncs.c uniqid.c Log: MFH: Fix protos
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.4&r2=1.312.2.20.2.32.2.5&diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.4 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.5 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.4 Fri Apr 4 17:42:18 2008 +++ php-src/ext/gd/gd.c Sun May 4 21:17:32 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.4 2008/04/04 17:42:18 felipe Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.5 2008/05/04 21:17:32 colder Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -4547,7 +4547,7 @@ } /* }}} */ -/* {{{ proto array imagepstext(resource image, string text, resource font, int size, int foreground, int background, int xcoord, int ycoord [, int space, int tightness, float angle, int antialias]) +/* {{{ proto array imagepstext(resource image, string text, resource font, int size, int foreground, int background, int xcoord, int ycoord [, int space [, int tightness [, float angle [, int antialias]) Rasterize a string over an image */ PHP_FUNCTION(imagepstext) { http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.11.2.7&r2=1.161.2.3.2.11.2.8&diff_format=u Index: php-src/ext/ldap/ldap.c diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.7 php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.8 --- php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.7 Wed Apr 16 14:21:04 2008 +++ php-src/ext/ldap/ldap.c Sun May 4 21:17:32 2008 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.161.2.3.2.11.2.7 2008/04/16 14:21:04 tony2001 Exp $ */ +/* $Id: ldap.c,v 1.161.2.3.2.11.2.8 2008/05/04 21:17:32 colder Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -237,7 +237,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled"); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3.2.11.2.7 2008/04/16 14:21:04 tony2001 Exp $"); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3.2.11.2.8 2008/05/04 21:17:32 colder Exp $"); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); @@ -386,7 +386,7 @@ } /* }}} */ -/* {{{ proto bool ldap_bind(resource link [, string dn, string password]) +/* {{{ proto bool ldap_bind(resource link [, string dn [, string password]]) Bind to LDAP directory */ PHP_FUNCTION(ldap_bind) { @@ -496,7 +496,7 @@ } /* }}} */ -/* {{{ proto bool ldap_sasl_bind(resource link [, string binddn, string password, string sasl_mech, string sasl_realm, string sasl_authc_id, string sasl_authz_id, string props]) +/* {{{ proto bool ldap_sasl_bind(resource link [, string binddn [, string password [, string sasl_mech [, string sasl_realm [, string sasl_authc_id [, string sasl_authz_id [, string props]]]]]]]) Bind to LDAP directory using SASL */ PHP_FUNCTION(ldap_sasl_bind) { http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.8&r2=1.98.2.5.2.41.2.9&diff_format=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.8 php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.9 --- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.8 Wed Apr 2 14:35:29 2008 +++ php-src/ext/openssl/openssl.c Sun May 4 21:17:32 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.98.2.5.2.41.2.8 2008/04/02 14:35:29 tony2001 Exp $ */ +/* $Id: openssl.c,v 1.98.2.5.2.41.2.9 2008/05/04 21:17:32 colder Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2138,7 +2138,7 @@ } /* }}} */ -/* {{{ proto bool openssl_csr_new(array dn, resource &privkey [, array configargs, array extraattribs]) +/* {{{ proto bool openssl_csr_new(array dn, resource &privkey [, array configargs [, array extraattribs]]) Generates a privkey and CSR */ PHP_FUNCTION(openssl_csr_new) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.12&r2=1.409.2.6.2.28.2.13&diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.12 php-src/ext/standard/file.c:1.409.2.6.2.28.2.13 --- php-src/ext/standard/file.c:1.409.2.6.2.28.2.12 Tue Apr 15 15:48:20 2008 +++ php-src/ext/standard/file.c Sun May 4 21:17:32 2008 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.409.2.6.2.28.2.12 2008/04/15 15:48:20 iliaa Exp $ */ +/* $Id: file.c,v 1.409.2.6.2.28.2.13 2008/05/04 21:17:32 colder Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -1118,7 +1118,7 @@ } /* }}} */ -/* {{{ proto string fgetss(resource fp [, int length, string allowable_tags]) +/* {{{ proto string fgetss(resource fp [, int length [, string allowable_tags]]) Get a line from file pointer and strip HTML tags */ PHPAPI PHP_FUNCTION(fgetss) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.13&r2=1.58.2.6.2.15.2.14&diff_format=u Index: php-src/ext/standard/streamsfuncs.c diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.13 php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.14 --- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.13 Mon Apr 14 08:15:11 2008 +++ php-src/ext/standard/streamsfuncs.c Sun May 4 21:17:33 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.13 2008/04/14 08:15:11 bjori Exp $ */ +/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.14 2008/05/04 21:17:33 colder Exp $ */ #include "php.h" #include "php_globals.h" @@ -75,7 +75,7 @@ /* }}} */ #endif -/* {{{ proto resource stream_socket_client(string remoteaddress [, long &errcode, string &errstring, double timeout, long flags, resource context]) +/* {{{ proto resource stream_socket_client(string remoteaddress [, long &errcode [, string &errstring [, double timeout [, long flags [, resource context]]]]]) Open a client connection to a remote address */ PHP_FUNCTION(stream_socket_client) { @@ -162,7 +162,7 @@ } /* }}} */ -/* {{{ proto resource stream_socket_server(string localaddress [, long &errcode, string &errstring, long flags, resource context]) +/* {{{ proto resource stream_socket_server(string localaddress [, long &errcode [, string &errstring [, long flags [, resource context]]]]) Create a server socket bound to localaddress */ PHP_FUNCTION(stream_socket_server) { @@ -227,7 +227,7 @@ } /* }}} */ -/* {{{ proto resource stream_socket_accept(resource serverstream, [ double timeout, string &peername ]) +/* {{{ proto resource stream_socket_accept(resource serverstream, [ double timeout [, string &peername ]]) Accept a client connection from a server socket */ PHP_FUNCTION(stream_socket_accept) { @@ -1312,7 +1312,7 @@ } /* }}} */ -/* {{{ proto int stream_socket_enable_crypto(resource stream, bool enable [, int cryptokind, resource sessionstream]) +/* {{{ proto int stream_socket_enable_crypto(resource stream, bool enable [, int cryptokind [, resource sessionstream]]) Enable or disable a specific kind of crypto on the stream */ PHP_FUNCTION(stream_socket_enable_crypto) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/uniqid.c?r1=1.41.2.2.2.2.2.2&r2=1.41.2.2.2.2.2.3&diff_format=u Index: php-src/ext/standard/uniqid.c diff -u php-src/ext/standard/uniqid.c:1.41.2.2.2.2.2.2 php-src/ext/standard/uniqid.c:1.41.2.2.2.2.2.3 --- php-src/ext/standard/uniqid.c:1.41.2.2.2.2.2.2 Mon Dec 31 07:17:15 2007 +++ php-src/ext/standard/uniqid.c Sun May 4 21:17:33 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: uniqid.c,v 1.41.2.2.2.2.2.2 2007/12/31 07:17:15 sebastian Exp $ */ +/* $Id: uniqid.c,v 1.41.2.2.2.2.2.3 2008/05/04 21:17:33 colder Exp $ */ #include "php.h" @@ -38,7 +38,7 @@ #include "php_lcg.h" #include "uniqid.h" -/* {{{ proto string uniqid([string prefix , bool more_entropy]) +/* {{{ proto string uniqid([string prefix [, bool more_entropy]]) Generates a unique ID */ #ifdef HAVE_GETTIMEOFDAY PHP_FUNCTION(uniqid)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php