[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Jan 9 01:31:08 2007 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1052r2=1.1053diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1052 ZendEngine2/ChangeLog:1.1053 --- ZendEngine2/ChangeLog:1.1052Mon Jan 8 01:31:08 2007 +++ ZendEngine2/ChangeLog Tue Jan 9 01:31:08 2007 @@ -1,3 +1,11 @@ +2007-01-08 Andrei Zmievski [EMAIL PROTECTED] + +* zend_unicode.c: + Let caller issue error. + +* zend_vm_def.h: + Note. + 2007-01-07 Sara Golemon [EMAIL PROTECTED] * zend_alloc.h: @@ -16528,7 +16536,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1052 2007/01/08 01:31:08 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1053 2007/01/09 01:31:08 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -18252,7 +18260,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1052 2007/01/08 01:31:08 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1053 2007/01/09 01:31:08 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard string.c
iliaa Mon Jan 8 14:24:59 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard string.c Log: Use safe_emalloc() rather then emalloc() http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.36r2=1.445.2.14.2.37diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.445.2.14.2.36 php-src/ext/standard/string.c:1.445.2.14.2.37 --- php-src/ext/standard/string.c:1.445.2.14.2.36 Mon Jan 1 09:36:09 2007 +++ php-src/ext/standard/string.c Mon Jan 8 14:24:59 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: string.c,v 1.445.2.14.2.36 2007/01/01 09:36:09 sebastian Exp $ */ +/* $Id: string.c,v 1.445.2.14.2.37 2007/01/08 14:24:59 iliaa Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -3144,7 +3144,7 @@ } Z_STRLEN_P(result) = len + (char_count * (to_len - 1)); - Z_STRVAL_P(result) = target = emalloc(Z_STRLEN_P(result) + 1); + Z_STRVAL_P(result) = target = safe_emalloc(char_count, to_len, len); Z_TYPE_P(result) = IS_STRING; if (case_sensitivity) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard string.c
iliaa Mon Jan 8 14:25:22 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/standard string.c Log: MFH: Use safe_emalloc() rather then emalloc() http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.333.2.52.2.8r2=1.333.2.52.2.9diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.333.2.52.2.8 php-src/ext/standard/string.c:1.333.2.52.2.9 --- php-src/ext/standard/string.c:1.333.2.52.2.8Mon Jan 1 09:46:48 2007 +++ php-src/ext/standard/string.c Mon Jan 8 14:25:22 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: string.c,v 1.333.2.52.2.8 2007/01/01 09:46:48 sebastian Exp $ */ +/* $Id: string.c,v 1.333.2.52.2.9 2007/01/08 14:25:22 iliaa Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -2531,7 +2531,7 @@ } Z_STRLEN_P(result) = len + (char_count * (to_len - 1)); - Z_STRVAL_P(result) = target = emalloc(Z_STRLEN_P(result) + 1); + Z_STRVAL_P(result) = target = safe_emalloc(char_count, to_len, len); Z_TYPE_P(result) = IS_STRING; for (source = str; source source_end; source++) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c
iliaa Mon Jan 8 14:25:49 2007 UTC Modified files: /php-src/ext/standard string.c Log: MFB: Use safe_emalloc() rather then emalloc() http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.629r2=1.630diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.629 php-src/ext/standard/string.c:1.630 --- php-src/ext/standard/string.c:1.629 Mon Jan 1 09:29:32 2007 +++ php-src/ext/standard/string.c Mon Jan 8 14:25:49 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: string.c,v 1.629 2007/01/01 09:29:32 sebastian Exp $ */ +/* $Id: string.c,v 1.630 2007/01/08 14:25:49 iliaa Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -4914,7 +4914,7 @@ } Z_STRLEN_P(result) = len + (char_count * (to_len - 1)); - Z_STRVAL_P(result) = target = emalloc(Z_STRLEN_P(result) + 1); + Z_STRVAL_P(result) = target = safe_emalloc(char_count, to_len, len); Z_TYPE_P(result) = IS_STRING; if (case_sensitivity) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap config.m4
andrei Mon Jan 8 18:23:23 2007 UTC Modified files: /php-src/ext/imap config.m4 Log: Fix IMAP check. http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.70r2=1.71diff_format=u Index: php-src/ext/imap/config.m4 diff -u php-src/ext/imap/config.m4:1.70 php-src/ext/imap/config.m4:1.71 --- php-src/ext/imap/config.m4:1.70 Sun Sep 24 18:06:53 2006 +++ php-src/ext/imap/config.m4 Mon Jan 8 18:23:23 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.70 2006/09/24 18:06:53 iliaa Exp $ +dnl $Id: config.m4,v 1.71 2007/01/08 18:23:23 andrei Exp $ dnl AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then @@ -65,6 +65,9 @@ AC_DEFUN([PHP_IMAP_SSL_CHK], [ if test $PHP_IMAP_SSL != no; then +if test $PHP_OPENSSL == ; then + PHP_OPENSSL='no' +fi PHP_SETUP_OPENSSL(IMAP_SHARED_LIBADD, [ AC_DEFINE(HAVE_IMAP_SSL,1,[ ]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml libxml.c php_libxml.h
pollita Mon Jan 8 20:01:23 2007 UTC Modified files: /php-src/ext/libxml libxml.c php_libxml.h Log: Allow libxml DomNodes to remain persistent when requested by other extensions http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.56r2=1.57diff_format=u Index: php-src/ext/libxml/libxml.c diff -u php-src/ext/libxml/libxml.c:1.56 php-src/ext/libxml/libxml.c:1.57 --- php-src/ext/libxml/libxml.c:1.56Mon Jan 1 09:29:25 2007 +++ php-src/ext/libxml/libxml.c Mon Jan 8 20:01:23 2007 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: libxml.c,v 1.56 2007/01/01 09:29:25 sebastian Exp $ */ +/* $Id: libxml.c,v 1.57 2007/01/08 20:01:23 pollita Exp $ */ #define IS_EXT_MODULE @@ -947,7 +947,9 @@ ret_refcount = object-document-refcount; } else if (docp != NULL) { ret_refcount = 1; - object-document = emalloc(sizeof(php_libxml_ref_obj)); + object-document = pemalloc(sizeof(php_libxml_ref_obj), 0); + object-document-persistent = 0; + object-document-external_owner = 0; object-document-ptr = docp; object-document-refcount = ret_refcount; object-document-doc_props = NULL; @@ -972,9 +974,23 @@ } efree(object-document-doc_props); } - efree(object-document); + pefree(object-document, object-document-persistent); object-document = NULL; - } + } else if (ret_refcount == 1 object-document-external_owner) { + /* PHP is done with this object, but someone else owns the DomNodes, +* Kill the non-persistent bits, but leave the persistable php_libxml_ref_obj around */ + if (object-document-doc_props != NULL) { + if (object-document-doc_props-classmap) { + zend_hash_destroy(object-document-doc_props-classmap); + FREE_HASHTABLE(object-document-doc_props-classmap); + } + efree(object-document-doc_props); + object-document-doc_props = NULL; + } + /* Don't worry about the fact that this memory is left unfreed, +* Whoever else owns it has the pointer stored somewhere */ + object-document = NULL; + } } return ret_refcount; http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/php_libxml.h?r1=1.23r2=1.24diff_format=u Index: php-src/ext/libxml/php_libxml.h diff -u php-src/ext/libxml/php_libxml.h:1.23 php-src/ext/libxml/php_libxml.h:1.24 --- php-src/ext/libxml/php_libxml.h:1.23Mon Jan 1 09:29:25 2007 +++ php-src/ext/libxml/php_libxml.h Mon Jan 8 20:01:23 2007 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_libxml.h,v 1.23 2007/01/01 09:29:25 sebastian Exp $ */ +/* $Id: php_libxml.h,v 1.24 2007/01/08 20:01:23 pollita Exp $ */ #ifndef PHP_LIBXML_H #define PHP_LIBXML_H @@ -58,6 +58,8 @@ void *ptr; int refcount; libxml_doc_props *doc_props; + zend_bool persistent; + zend_bool external_owner; } php_libxml_ref_obj; typedef struct _php_libxml_node_ptr { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
pollita Mon Jan 8 20:04:56 2007 UTC Modified files: /php-src/ext/curl interface.c Log: Add CURLOPT_TCP_NODELAY http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.106r2=1.107diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.106 php-src/ext/curl/interface.c:1.107 --- php-src/ext/curl/interface.c:1.106 Mon Jan 1 09:29:22 2007 +++ php-src/ext/curl/interface.cMon Jan 8 20:04:56 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: interface.c,v 1.106 2007/01/01 09:29:22 sebastian Exp $ */ +/* $Id: interface.c,v 1.107 2007/01/08 20:04:56 pollita Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -450,6 +450,7 @@ REGISTER_CURL_CONSTANT(CURLOPT_PROXYPORT); REGISTER_CURL_CONSTANT(CURLOPT_UNRESTRICTED_AUTH); REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_EPRT); + REGISTER_CURL_CONSTANT(CURLOPT_TCP_NODELAY); REGISTER_CURL_CONSTANT(CURLOPT_HTTP200ALIASES); REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFMODSINCE); REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFUNMODSINCE); @@ -1268,6 +1269,7 @@ case CURLOPT_PORT: case CURLOPT_AUTOREFERER: case CURLOPT_COOKIESESSION: + case CURLOPT_TCP_NODELAY: convert_to_long_ex(zvalue); error = curl_easy_setopt(ch-cp, option, Z_LVAL_PP(zvalue)); break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap config.m4
andrei Mon Jan 8 22:24:11 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/imap config.m4 Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69.4.1r2=1.69.4.2diff_format=u Index: php-src/ext/imap/config.m4 diff -u php-src/ext/imap/config.m4:1.69.4.1 php-src/ext/imap/config.m4:1.69.4.2 --- php-src/ext/imap/config.m4:1.69.4.1 Sun Sep 24 18:06:37 2006 +++ php-src/ext/imap/config.m4 Mon Jan 8 22:24:11 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.69.4.1 2006/09/24 18:06:37 iliaa Exp $ +dnl $Id: config.m4,v 1.69.4.2 2007/01/08 22:24:11 andrei Exp $ dnl AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then @@ -65,6 +65,9 @@ AC_DEFUN([PHP_IMAP_SSL_CHK], [ if test $PHP_IMAP_SSL != no; then +if test $PHP_OPENSSL == ; then + PHP_OPENSSL='no' +fi PHP_SETUP_OPENSSL(IMAP_SHARED_LIBADD, [ AC_DEFINE(HAVE_IMAP_SSL,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_2) /ext/hash hash.c hash_adler32.c hash_crc32.c hash_gost.c hash_haval.c hash_md.c hash_ripemd.c hash_salsa.c hash_sha.c hash_snefru.c hash_tiger.c hash_whirlpool.c php_ha
nlopess Mon Jan 8 22:29:26 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/hash hash.c hash_adler32.c hash_crc32.c hash_gost.c hash_haval.c hash_md.c hash_ripemd.c hash_salsa.c hash_sha.c hash_snefru.c hash_tiger.c hash_whirlpool.c php_hash.h Log: make the hash_ops structures const and save some memory # ram memory is so expensive these days... http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash.c?r1=1.18.2.5.2.5r2=1.18.2.5.2.6diff_format=u Index: php-src/ext/hash/hash.c diff -u php-src/ext/hash/hash.c:1.18.2.5.2.5 php-src/ext/hash/hash.c:1.18.2.5.2.6 --- php-src/ext/hash/hash.c:1.18.2.5.2.5Mon Jan 1 09:36:01 2007 +++ php-src/ext/hash/hash.c Mon Jan 8 22:29:25 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: hash.c,v 1.18.2.5.2.5 2007/01/01 09:36:01 sebastian Exp $ */ +/* $Id: hash.c,v 1.18.2.5.2.6 2007/01/08 22:29:25 nlopess Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -37,7 +37,7 @@ /* Hash Registry Access */ -PHP_HASH_API php_hash_ops *php_hash_fetch_ops(const char *algo, int algo_len) +PHP_HASH_API const php_hash_ops *php_hash_fetch_ops(const char *algo, int algo_len) { php_hash_ops *ops; char *lower = estrndup(algo, algo_len); @@ -51,13 +51,13 @@ return ops; } -PHP_HASH_API void php_hash_register_algo(const char *algo, php_hash_ops *ops) +PHP_HASH_API void php_hash_register_algo(const char *algo, const php_hash_ops *ops) { int algo_len = strlen(algo); char *lower = estrndup(algo, algo_len); zend_str_tolower(lower, algo_len); - zend_hash_add(php_hash_hashtable, lower, algo_len + 1, ops, sizeof(php_hash_ops), NULL); + zend_hash_add(php_hash_hashtable, lower, algo_len + 1, (void*)ops, sizeof(php_hash_ops), NULL); efree(lower); } @@ -68,7 +68,7 @@ char *algo, *data, *digest; int algo_len, data_len; zend_bool raw_output = 0; - php_hash_ops *ops; + const php_hash_ops *ops; void *context; php_stream *stream = NULL; @@ -142,7 +142,7 @@ char *algo, *data, *digest, *key, *K; int algo_len, data_len, key_len, i; zend_bool raw_output = 0; - php_hash_ops *ops; + const php_hash_ops *ops; void *context; php_stream *stream = NULL; @@ -255,7 +255,7 @@ int algo_len, key_len = 0, argc = ZEND_NUM_ARGS(); long options = 0; void *context; - php_hash_ops *ops; + const php_hash_ops *ops; php_hash_data *hash; if (zend_parse_parameters(argc TSRMLS_CC, s|ls, algo, algo_len, options, key, key_len) == FAILURE) { http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash_adler32.c?r1=1.3.2.4.2.1r2=1.3.2.4.2.2diff_format=u Index: php-src/ext/hash/hash_adler32.c diff -u php-src/ext/hash/hash_adler32.c:1.3.2.4.2.1 php-src/ext/hash/hash_adler32.c:1.3.2.4.2.2 --- php-src/ext/hash/hash_adler32.c:1.3.2.4.2.1 Mon Jan 1 09:36:01 2007 +++ php-src/ext/hash/hash_adler32.c Mon Jan 8 22:29:25 2007 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: hash_adler32.c,v 1.3.2.4.2.1 2007/01/01 09:36:01 sebastian Exp $ */ +/* $Id: hash_adler32.c,v 1.3.2.4.2.2 2007/01/08 22:29:25 nlopess Exp $ */ #include php_hash.h #include php_hash_adler32.h @@ -49,7 +49,7 @@ context-state = 0; } -php_hash_ops php_hash_adler32_ops = { +const php_hash_ops php_hash_adler32_ops = { (php_hash_init_func_t) PHP_ADLER32Init, (php_hash_update_func_t) PHP_ADLER32Update, (php_hash_final_func_t) PHP_ADLER32Final, http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash_crc32.c?r1=1.2.2.3.2.1r2=1.2.2.3.2.2diff_format=u Index: php-src/ext/hash/hash_crc32.c diff -u php-src/ext/hash/hash_crc32.c:1.2.2.3.2.1 php-src/ext/hash/hash_crc32.c:1.2.2.3.2.2 --- php-src/ext/hash/hash_crc32.c:1.2.2.3.2.1 Mon Jan 1 09:36:01 2007 +++ php-src/ext/hash/hash_crc32.c Mon Jan 8 22:29:25 2007 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: hash_crc32.c,v 1.2.2.3.2.1 2007/01/01 09:36:01 sebastian Exp $ */ +/* $Id: hash_crc32.c,v 1.2.2.3.2.2 2007/01/08 22:29:25 nlopess Exp $ */ #include php_hash.h #include php_hash_crc32.h @@ -56,7 +56,7 @@ context-state = 0; } -php_hash_ops php_hash_crc32_ops = { +const php_hash_ops php_hash_crc32_ops = { (php_hash_init_func_t) PHP_CRC32Init, (php_hash_update_func_t) PHP_CRC32Update, (php_hash_final_func_t) PHP_CRC32Final, @@ -65,7 +65,7 @@ sizeof(PHP_CRC32_CTX) }; -php_hash_ops php_hash_crc32b_ops = { +const php_hash_ops php_hash_crc32b_ops = { (php_hash_init_func_t) PHP_CRC32Init, (php_hash_update_func_t) PHP_CRC32BUpdate, (php_hash_final_func_t) PHP_CRC32Final,
[PHP-CVS] cvs: php-src /ext/hash hash.c hash_adler32.c hash_crc32.c hash_gost.c hash_haval.c hash_md.c hash_ripemd.c hash_salsa.c hash_sha.c hash_snefru.c hash_tiger.c hash_whirlpool.c php_hash.h
nlopess Mon Jan 8 22:29:52 2007 UTC Modified files: /php-src/ext/hash hash.c hash_adler32.c hash_crc32.c hash_gost.c hash_haval.c hash_md.c hash_ripemd.c hash_salsa.c hash_sha.c hash_snefru.c hash_tiger.c hash_whirlpool.c php_hash.h Log: MFB: constify http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash.c?r1=1.33r2=1.34diff_format=u Index: php-src/ext/hash/hash.c diff -u php-src/ext/hash/hash.c:1.33 php-src/ext/hash/hash.c:1.34 --- php-src/ext/hash/hash.c:1.33Mon Jan 1 09:29:24 2007 +++ php-src/ext/hash/hash.c Mon Jan 8 22:29:52 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: hash.c,v 1.33 2007/01/01 09:29:24 sebastian Exp $ */ +/* $Id: hash.c,v 1.34 2007/01/08 22:29:52 nlopess Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -37,7 +37,7 @@ /* Hash Registry Access */ -PHP_HASH_API php_hash_ops *php_hash_fetch_ops(const char *algo, int algo_len) +PHP_HASH_API const php_hash_ops *php_hash_fetch_ops(const char *algo, int algo_len) { php_hash_ops *ops; char *lower = estrndup(algo, algo_len); @@ -51,13 +51,13 @@ return ops; } -PHP_HASH_API void php_hash_register_algo(const char *algo, php_hash_ops *ops) +PHP_HASH_API void php_hash_register_algo(const char *algo, const php_hash_ops *ops) { int algo_len = strlen(algo); char *lower = estrndup(algo, algo_len); zend_str_tolower(lower, algo_len); - zend_hash_add(php_hash_hashtable, lower, algo_len + 1, ops, sizeof(php_hash_ops), NULL); + zend_hash_add(php_hash_hashtable, lower, algo_len + 1, (void*)ops, sizeof(php_hash_ops), NULL); efree(lower); } @@ -69,7 +69,7 @@ int algo_len, data_len; zend_uchar data_type = IS_STRING; zend_bool raw_output = 0; - php_hash_ops *ops; + const php_hash_ops *ops; void *context; php_stream *stream = NULL; @@ -180,7 +180,7 @@ int algo_len, data_len, key_len, i; zend_uchar data_type = IS_STRING, key_type = IS_STRING; zend_bool raw_output = 0; - php_hash_ops *ops; + const php_hash_ops *ops; void *context; php_stream *stream = NULL; @@ -344,7 +344,7 @@ zend_uchar key_type; long options = 0; void *context; - php_hash_ops *ops; + const php_hash_ops *ops; php_hash_data *hash; if (zend_parse_parameters(argc TSRMLS_CC, s|lt, algo, algo_len, options, key, key_len, key_type) == FAILURE) { http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash_adler32.c?r1=1.6r2=1.7diff_format=u Index: php-src/ext/hash/hash_adler32.c diff -u php-src/ext/hash/hash_adler32.c:1.6 php-src/ext/hash/hash_adler32.c:1.7 --- php-src/ext/hash/hash_adler32.c:1.6 Mon Jan 1 09:29:24 2007 +++ php-src/ext/hash/hash_adler32.c Mon Jan 8 22:29:52 2007 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: hash_adler32.c,v 1.6 2007/01/01 09:29:24 sebastian Exp $ */ +/* $Id: hash_adler32.c,v 1.7 2007/01/08 22:29:52 nlopess Exp $ */ #include php_hash.h #include php_hash_adler32.h @@ -49,7 +49,7 @@ context-state = 0; } -php_hash_ops php_hash_adler32_ops = { +const php_hash_ops php_hash_adler32_ops = { (php_hash_init_func_t) PHP_ADLER32Init, (php_hash_update_func_t) PHP_ADLER32Update, (php_hash_final_func_t) PHP_ADLER32Final, http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash_crc32.c?r1=1.4r2=1.5diff_format=u Index: php-src/ext/hash/hash_crc32.c diff -u php-src/ext/hash/hash_crc32.c:1.4 php-src/ext/hash/hash_crc32.c:1.5 --- php-src/ext/hash/hash_crc32.c:1.4 Mon Jan 1 09:29:24 2007 +++ php-src/ext/hash/hash_crc32.c Mon Jan 8 22:29:52 2007 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: hash_crc32.c,v 1.4 2007/01/01 09:29:24 sebastian Exp $ */ +/* $Id: hash_crc32.c,v 1.5 2007/01/08 22:29:52 nlopess Exp $ */ #include php_hash.h #include php_hash_crc32.h @@ -56,7 +56,7 @@ context-state = 0; } -php_hash_ops php_hash_crc32_ops = { +const php_hash_ops php_hash_crc32_ops = { (php_hash_init_func_t) PHP_CRC32Init, (php_hash_update_func_t) PHP_CRC32Update, (php_hash_final_func_t) PHP_CRC32Final, @@ -65,7 +65,7 @@ sizeof(PHP_CRC32_CTX) }; -php_hash_ops php_hash_crc32b_ops = { +const php_hash_ops php_hash_crc32b_ops = { (php_hash_init_func_t) PHP_CRC32Init, (php_hash_update_func_t) PHP_CRC32BUpdate, (php_hash_final_func_t) PHP_CRC32Final, http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash_gost.c?r1=1.4r2=1.5diff_format=u Index: php-src/ext/hash/hash_gost.c diff -u php-src/ext/hash/hash_gost.c:1.4 php-src/ext/hash/hash_gost.c:1.5 --- php-src/ext/hash/hash_gost.c:1.4Mon Jan 1 09:29:24 2007 +++
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sysvmsg php_sysvmsg.h sysvmsg.c
nlopess Mon Jan 8 22:34:07 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/sysvmsgphp_sysvmsg.h sysvmsg.c Log: remove useless MSHUTDOWN function http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/php_sysvmsg.h?r1=1.6.2.1.2.1r2=1.6.2.1.2.2diff_format=u Index: php-src/ext/sysvmsg/php_sysvmsg.h diff -u php-src/ext/sysvmsg/php_sysvmsg.h:1.6.2.1.2.1 php-src/ext/sysvmsg/php_sysvmsg.h:1.6.2.1.2.2 --- php-src/ext/sysvmsg/php_sysvmsg.h:1.6.2.1.2.1 Mon Jan 1 09:36:09 2007 +++ php-src/ext/sysvmsg/php_sysvmsg.h Mon Jan 8 22:34:07 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_sysvmsg.h,v 1.6.2.1.2.1 2007/01/01 09:36:09 sebastian Exp $ */ +/* $Id: php_sysvmsg.h,v 1.6.2.1.2.2 2007/01/08 22:34:07 nlopess Exp $ */ #ifndef PHP_SYSVMSG_H #define PHP_SYSVMSG_H @@ -40,9 +40,6 @@ #endif PHP_MINIT_FUNCTION(sysvmsg); -PHP_MSHUTDOWN_FUNCTION(sysvmsg); -PHP_RINIT_FUNCTION(sysvmsg); -PHP_RSHUTDOWN_FUNCTION(sysvmsg); PHP_MINFO_FUNCTION(sysvmsg); PHP_FUNCTION(msg_get_queue); http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/sysvmsg.c?r1=1.20.2.3.2.4r2=1.20.2.3.2.5diff_format=u Index: php-src/ext/sysvmsg/sysvmsg.c diff -u php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.4 php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.5 --- php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.4 Fri Jan 5 15:06:55 2007 +++ php-src/ext/sysvmsg/sysvmsg.c Mon Jan 8 22:34:07 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: sysvmsg.c,v 1.20.2.3.2.4 2007/01/05 15:06:55 iliaa Exp $ */ +/* $Id: sysvmsg.c,v 1.20.2.3.2.5 2007/01/08 22:34:07 nlopess Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -84,7 +84,7 @@ sysvmsg, sysvmsg_functions, PHP_MINIT(sysvmsg), - PHP_MSHUTDOWN(sysvmsg), + NULL, NULL, NULL, PHP_MINFO(sysvmsg), @@ -130,21 +130,13 @@ } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ -PHP_MSHUTDOWN_FUNCTION(sysvmsg) -{ - return SUCCESS; -} -/* }}} */ - /* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(sysvmsg) { php_info_print_table_start(); php_info_print_table_row(2, sysvmsg support, enabled); - php_info_print_table_row(2, Revision, $Revision: 1.20.2.3.2.4 $); + php_info_print_table_row(2, Revision, $Revision: 1.20.2.3.2.5 $); php_info_print_table_end(); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sysvmsg php_sysvmsg.h sysvmsg.c
nlopess Mon Jan 8 22:35:25 2007 UTC Modified files: /php-src/ext/sysvmsgphp_sysvmsg.h sysvmsg.c Log: MFB: remove mshutdown func http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/php_sysvmsg.h?r1=1.8r2=1.9diff_format=u Index: php-src/ext/sysvmsg/php_sysvmsg.h diff -u php-src/ext/sysvmsg/php_sysvmsg.h:1.8 php-src/ext/sysvmsg/php_sysvmsg.h:1.9 --- php-src/ext/sysvmsg/php_sysvmsg.h:1.8 Mon Jan 1 09:29:33 2007 +++ php-src/ext/sysvmsg/php_sysvmsg.h Mon Jan 8 22:35:25 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_sysvmsg.h,v 1.8 2007/01/01 09:29:33 sebastian Exp $ */ +/* $Id: php_sysvmsg.h,v 1.9 2007/01/08 22:35:25 nlopess Exp $ */ #ifndef PHP_SYSVMSG_H #define PHP_SYSVMSG_H @@ -40,9 +40,6 @@ #endif PHP_MINIT_FUNCTION(sysvmsg); -PHP_MSHUTDOWN_FUNCTION(sysvmsg); -PHP_RINIT_FUNCTION(sysvmsg); -PHP_RSHUTDOWN_FUNCTION(sysvmsg); PHP_MINFO_FUNCTION(sysvmsg); PHP_FUNCTION(msg_get_queue); http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/sysvmsg.c?r1=1.29r2=1.30diff_format=u Index: php-src/ext/sysvmsg/sysvmsg.c diff -u php-src/ext/sysvmsg/sysvmsg.c:1.29 php-src/ext/sysvmsg/sysvmsg.c:1.30 --- php-src/ext/sysvmsg/sysvmsg.c:1.29 Mon Jan 1 09:29:33 2007 +++ php-src/ext/sysvmsg/sysvmsg.c Mon Jan 8 22:35:25 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: sysvmsg.c,v 1.29 2007/01/01 09:29:33 sebastian Exp $ */ +/* $Id: sysvmsg.c,v 1.30 2007/01/08 22:35:25 nlopess Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -84,7 +84,7 @@ sysvmsg, sysvmsg_functions, PHP_MINIT(sysvmsg), - PHP_MSHUTDOWN(sysvmsg), + NULL, NULL, NULL, PHP_MINFO(sysvmsg), @@ -130,21 +130,13 @@ } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ -PHP_MSHUTDOWN_FUNCTION(sysvmsg) -{ - return SUCCESS; -} -/* }}} */ - /* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(sysvmsg) { php_info_print_table_start(); php_info_print_table_row(2, sysvmsg support, enabled); - php_info_print_table_row(2, Revision, $Revision: 1.29 $); + php_info_print_table_row(2, Revision, $Revision: 1.30 $); php_info_print_table_end(); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd gd.c php_gd.h
nlopess Mon Jan 8 22:52:23 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/gd gd.c php_gd.h Log: avoid calling MSHUTDOWN when built without libt1 http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.13r2=1.312.2.20.2.14diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.13 php-src/ext/gd/gd.c:1.312.2.20.2.14 --- php-src/ext/gd/gd.c:1.312.2.20.2.13 Fri Jan 5 15:06:55 2007 +++ php-src/ext/gd/gd.c Mon Jan 8 22:52:22 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.13 2007/01/05 15:06:55 iliaa Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.14 2007/01/08 22:52:22 nlopess Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1147,7 +1147,11 @@ gd, gd_functions, PHP_MINIT(gd), +#if HAVE_LIBT1 PHP_MSHUTDOWN(gd), +#else + NULL, +#endif NULL, #if HAVE_LIBGD20 HAVE_GD_STRINGFT (HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE) PHP_RSHUTDOWN(gd), @@ -1191,16 +1195,16 @@ } /* }}} */ +#if HAVE_LIBT1 /* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(gd) { -#if HAVE_LIBT1 T1_CloseLib(); -#endif return SUCCESS; } /* }}} */ +#endif /* {{{ PHP_MINIT_FUNCTION http://cvs.php.net/viewvc.cgi/php-src/ext/gd/php_gd.h?r1=1.59.2.3.2.1r2=1.59.2.3.2.2diff_format=u Index: php-src/ext/gd/php_gd.h diff -u php-src/ext/gd/php_gd.h:1.59.2.3.2.1 php-src/ext/gd/php_gd.h:1.59.2.3.2.2 --- php-src/ext/gd/php_gd.h:1.59.2.3.2.1Mon Jan 1 09:36:01 2007 +++ php-src/ext/gd/php_gd.h Mon Jan 8 22:52:22 2007 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_gd.h,v 1.59.2.3.2.1 2007/01/01 09:36:01 sebastian Exp $ */ +/* $Id: php_gd.h,v 1.59.2.3.2.2 2007/01/08 22:52:22 nlopess Exp $ */ #ifndef PHP_GD_H #define PHP_GD_H @@ -66,7 +66,9 @@ /* gd.c functions */ PHP_MINFO_FUNCTION(gd); PHP_MINIT_FUNCTION(gd); +#if HAVE_LIBT1 PHP_MSHUTDOWN_FUNCTION(gd); +#endif #if HAVE_LIBGD20 HAVE_GD_STRINGFT PHP_RSHUTDOWN_FUNCTION(gd); #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd gd.c php_gd.h
On Mon, 8 Jan 2007, Nuno Lopes wrote: nlopess Mon Jan 8 22:52:23 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/gd gd.c php_gd.h Log: avoid calling MSHUTDOWN when built without libt1 Is it really needed to clog the source code with those ifdefs? It's not like this is a performance issue here... regards, Derick http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.13r2=1.312.2.20.2.14diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.13 php-src/ext/gd/gd.c:1.312.2.20.2.14 --- php-src/ext/gd/gd.c:1.312.2.20.2.13 Fri Jan 5 15:06:55 2007 +++ php-src/ext/gd/gd.c Mon Jan 8 22:52:22 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.13 2007/01/05 15:06:55 iliaa Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.14 2007/01/08 22:52:22 nlopess Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1147,7 +1147,11 @@ gd, gd_functions, PHP_MINIT(gd), +#if HAVE_LIBT1 PHP_MSHUTDOWN(gd), +#else + NULL, +#endif NULL, #if HAVE_LIBGD20 HAVE_GD_STRINGFT (HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE) PHP_RSHUTDOWN(gd), @@ -1191,16 +1195,16 @@ } /* }}} */ +#if HAVE_LIBT1 /* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(gd) { -#if HAVE_LIBT1 T1_CloseLib(); -#endif return SUCCESS; } /* }}} */ +#endif /* {{{ PHP_MINIT_FUNCTION http://cvs.php.net/viewvc.cgi/php-src/ext/gd/php_gd.h?r1=1.59.2.3.2.1r2=1.59.2.3.2.2diff_format=u Index: php-src/ext/gd/php_gd.h diff -u php-src/ext/gd/php_gd.h:1.59.2.3.2.1 php-src/ext/gd/php_gd.h:1.59.2.3.2.2 --- php-src/ext/gd/php_gd.h:1.59.2.3.2.1 Mon Jan 1 09:36:01 2007 +++ php-src/ext/gd/php_gd.h Mon Jan 8 22:52:22 2007 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_gd.h,v 1.59.2.3.2.1 2007/01/01 09:36:01 sebastian Exp $ */ +/* $Id: php_gd.h,v 1.59.2.3.2.2 2007/01/08 22:52:22 nlopess Exp $ */ #ifndef PHP_GD_H #define PHP_GD_H @@ -66,7 +66,9 @@ /* gd.c functions */ PHP_MINFO_FUNCTION(gd); PHP_MINIT_FUNCTION(gd); +#if HAVE_LIBT1 PHP_MSHUTDOWN_FUNCTION(gd); +#endif #if HAVE_LIBGD20 HAVE_GD_STRINGFT PHP_RSHUTDOWN_FUNCTION(gd); #endif -- 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
[PHP-CVS] cvs: php-src /ext/gd gd.c php_gd.h
nlopess Mon Jan 8 22:56:26 2007 UTC Modified files: /php-src/ext/gd gd.c php_gd.h Log: MFB http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.364r2=1.365diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.364 php-src/ext/gd/gd.c:1.365 --- php-src/ext/gd/gd.c:1.364 Mon Jan 1 09:29:24 2007 +++ php-src/ext/gd/gd.c Mon Jan 8 22:56:25 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.364 2007/01/01 09:29:24 sebastian Exp $ */ +/* $Id: gd.c,v 1.365 2007/01/08 22:56:25 nlopess Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1078,7 +1078,11 @@ gd, gd_functions, PHP_MINIT(gd), +#if HAVE_LIBT1 PHP_MSHUTDOWN(gd), +#else + NULL, +#endif NULL, #if HAVE_GD_STRINGFT (HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE) PHP_RSHUTDOWN(gd), @@ -1122,16 +1126,16 @@ } /* }}} */ +#if HAVE_LIBT1 /* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(gd) { -#if HAVE_LIBT1 T1_CloseLib(); -#endif return SUCCESS; } /* }}} */ +#endif /* {{{ PHP_MINIT_FUNCTION http://cvs.php.net/viewvc.cgi/php-src/ext/gd/php_gd.h?r1=1.71r2=1.72diff_format=u Index: php-src/ext/gd/php_gd.h diff -u php-src/ext/gd/php_gd.h:1.71 php-src/ext/gd/php_gd.h:1.72 --- php-src/ext/gd/php_gd.h:1.71Mon Jan 1 09:29:24 2007 +++ php-src/ext/gd/php_gd.h Mon Jan 8 22:56:26 2007 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_gd.h,v 1.71 2007/01/01 09:29:24 sebastian Exp $ */ +/* $Id: php_gd.h,v 1.72 2007/01/08 22:56:26 nlopess Exp $ */ #ifndef PHP_GD_H #define PHP_GD_H @@ -64,7 +64,9 @@ /* gd.c functions */ PHP_MINFO_FUNCTION(gd); PHP_MINIT_FUNCTION(gd); +#if HAVE_LIBT1 PHP_MSHUTDOWN_FUNCTION(gd); +#endif #if HAVE_GD_STRINGFT PHP_RSHUTDOWN_FUNCTION(gd); #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd gd.c php_gd.h
Hello, On 1/8/07, Derick Rethans [EMAIL PROTECTED] wrote: On Mon, 8 Jan 2007, Nuno Lopes wrote: nlopess Mon Jan 8 22:52:23 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/gd gd.c php_gd.h Log: avoid calling MSHUTDOWN when built without libt1 Is it really needed to clog the source code with those ifdefs? It's not like this is a performance issue here... I agree. There is no issue to fix :) That being said, I'm not sure such changes are welcome during the RC phase. Please try to commit such changes after 5.2.1. --Pierre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php