[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar stream.c

[Greg Beaver]

cellog          Sun Aug 31 06:47:39 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/phar   phar.phar stream.c 
  Log:
  merge from pecl/phar strlen optimizations
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.39&r2=1.7.2.40&diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.39 php-src/ext/phar/phar.phar:1.7.2.40
--- php-src/ext/phar/phar.phar:1.7.2.39 Sun Aug 31 06:38:09 2008
+++ php-src/ext/phar/phar.phar  Sun Aug 31 06:47:38 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?>
-6
-+6
+ 
ž¶Â²Ø䂱÷¡ˆJÉþžs±æêÔ*,8ƒW——?°!~ý븅ˆY…åBós„.coîd!¨`w¡ŽóLæȹBÀ’í.å[ža‘äÙs\í¹
 gߜ×
 „ób„náNŸ@@ -1229,4 +1229,4 @@
 ùU™NøÖ        [EMAIL PROTECTED]"[EMAIL PROTECTED]     
¬ËaYšº
[Ã⎬mòvOë<ý]¸¹)×soS…jßZæ/]ûô‚Þv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ŒÐӛ*€Çê=KÕO)ò)‘«Ë-ԍ]µLí‹·¡7µ¾Í¨.î
Ÿšzÿ.jß?8Tù®,˜:«Äa·éï¤Á»hg•
 ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4ʃ¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,[EMAIL PROTECTED]
íÑ藵ïtúÎþ®øÚ÷Eí»ú¡ÃÏà›Ÿ‚ÇGx‰îӟ᧾óãæ]Ž¢Õ~f–I|øðP› 
j„7l1ØÛPšH†üéÅiGH¬5´¯’$ß/rªýëІ~ѐ›úgìªz²¢ÎÛ¦pu€Šùäûù;â9³™䂯;[EMAIL 
PROTECTED]
-Pàø3C°\ No newline at end of file
+Pàø3C°\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/stream.c?r1=1.27.2.16&r2=1.27.2.17&diff_format=u
Index: php-src/ext/phar/stream.c
diff -u php-src/ext/phar/stream.c:1.27.2.16 php-src/ext/phar/stream.c:1.27.2.17
--- php-src/ext/phar/stream.c:1.27.2.16 Sun Aug 31 02:14:03 2008
+++ php-src/ext/phar/stream.c   Sun Aug 31 06:47:38 2008
@@ -676,6 +676,7 @@
 {
        php_url *resource;
        char *internal_file, *error;
+       int internal_file_len;
        phar_entry_data *idata;
        phar_archive_data **pphar;
        uint host_len;
@@ -701,7 +702,7 @@
        host_len = strlen(resource->host);
        phar_request_initialize(TSRMLS_C);
 
-       if (FAILURE == zend_hash_find(&(PHAR_GLOBALS->phar_fname_map), 
resource->host, strlen(resource->host), (void **) &pphar)) {
+       if (FAILURE == zend_hash_find(&(PHAR_GLOBALS->phar_fname_map), 
resource->host, host_len, (void **) &pphar)) {
                pphar = NULL;
        }
        if (PHAR_G(readonly) && (!pphar || !(*pphar)->is_data)) {
@@ -712,7 +713,8 @@
 
        /* need to copy to strip leading "/", will get touched again */
        internal_file = estrdup(resource->path + 1);
-       if (FAILURE == phar_get_entry_data(&idata, resource->host, 
strlen(resource->host), internal_file, strlen(internal_file), "r", 0, &error, 1 
TSRMLS_CC)) {
+       internal_file_len = strlen(internal_file);
+       if (FAILURE == phar_get_entry_data(&idata, resource->host, host_len, 
internal_file, internal_file_len, "r", 0, &error, 1 TSRMLS_CC)) {
                /* constraints of fp refcount were not met */
                if (error) {
                        php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, "unlink of \"%s\" failed: %s", url, error);
@@ -829,7 +831,7 @@
 
        host_len = strlen(resource_from->host);
 
-       if (SUCCESS != phar_get_archive(&phar, resource_from->host, 
strlen(resource_from->host), NULL, 0, &error TSRMLS_CC)) {
+       if (SUCCESS != phar_get_archive(&phar, resource_from->host, host_len, 
NULL, 0, &error TSRMLS_CC)) {
                php_url_free(resource_from);
                php_url_free(resource_to);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "phar error: cannot 
rename \"%s\" to \"%s\": %s", url_from, url_to, error);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php