[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c

2013-10-21 Thread Xinchen Hui 
Commit:aed56fc9a7951e132b016a2deb8c4ede68bb02b4
Author:Xinchen Hui  Mon, 21 Oct 2013 17:41:03 
+0800
Parents:   19e8052be31d8361477906932f4c6dc9cd738de2 
098855433dc5d609e3970f0bc9d6766c007273f3
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=aed56fc9a7951e132b016a2deb8c4ede68bb02b4

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  ext/opcache/ZendAccelerator.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c

2013-10-21 Thread Dmitry Stogov 
Commit:02214e7a22dbfa2f3670737b9ff9d12bf123959c
Author:Dmitry Stogov  Mon, 21 Oct 2013 14:18:17 
+0400
Parents:   454a9fcb14c62384bd223c1d5668701061cf647f 
60ce3811ae3b86eb7bfb86cc965e3f79e61bfc4a
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=02214e7a22dbfa2f3670737b9ff9d12bf123959c

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed compilation warning

Changed paths:
  MM  ext/opcache/ZendAccelerator.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h

2013-09-25 Thread Dmitry Stogov 
Commit:6daa04a4f606f8121d9f1ea6cd90c1c8a684500e
Author:Dmitry Stogov  Wed, 25 Sep 2013 12:15:01 
+0400
Parents:   4e249c8a932675e5aceeb52c3ff6f6465d8a8ed1 
69454d9f0f765416f245acbc626b3984dcbf5e1d
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6daa04a4f606f8121d9f1ea6cd90c1c8a684500e

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added function opcache_compile_file() to load PHP scripts into cache without 
execution.

Conflicts:
NEWS

Changed paths:
  MM  ext/opcache/ZendAccelerator.c
  MM  ext/opcache/ZendAccelerator.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c

2013-09-25 Thread Dmitry Stogov 
Commit:4e249c8a932675e5aceeb52c3ff6f6465d8a8ed1
Author:Dmitry Stogov  Wed, 25 Sep 2013 11:04:03 
+0400
Parents:   8d087dc0d7c88e26539646875dc0f7bb5042187b 
dc8705c256cd1d50cfa276e8de31558e089eab92
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=4e249c8a932675e5aceeb52c3ff6f6465d8a8ed1

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed issue #135 (segfault in interned strings if initial memory is too low)

Conflicts:
NEWS

Bugs:
https://bugs.php.net/135

Changed paths:
  MM  ext/opcache/ZendAccelerator.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c

2013-09-08 Thread Dmitry Stogov 
Commit:df711f2c56c74609ec5865fab5fee247b175c654
Author:Dmitry Stogov  Mon, 9 Sep 2013 10:11:43 
+0400
Parents:   2f4bc9d4af220f65bea03fe9203539f4a3e6a214 
8d860c121810d6a10380241a0a51387966a503ca
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=df711f2c56c74609ec5865fab5fee247b175c654

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed issue #128 (opcache_invalidate segmentation fault)

Bugs:
https://bugs.php.net/128

Changed paths:
  MM  ext/opcache/ZendAccelerator.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h

2013-07-30 Thread Dmitry Stogov 
Commit:0aa342e903bf012efe03db1e9f1fe4ed54225e76
Author:Dmitry Stogov  Tue, 30 Jul 2013 17:36:47 
+0400
Parents:   5e1ac558c3354f98a9a5aecb5b518c46cd55357a 
3550f3d0aad6e979e2a6fe3ee40d4fbff168c34b
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0aa342e903bf012efe03db1e9f1fe4ed54225e76

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).

Conflicts:
NEWS

Bugs:
https://bugs.php.net/65338

Changed paths:
  MM  ext/opcache/ZendAccelerator.c
  MM  ext/opcache/ZendAccelerator.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h

2013-07-28 Thread Dmitry Stogov 
Commit:294335761b75d13d374312d9074d1f9270f69267
Author:Dmitry Stogov  Sun, 28 Jul 2013 13:50:13 
+0400
Parents:   d4aee1021e6a29f62dcb9c96e945a0fe710c8832 
ae5e70afac265e6b113d7995bb10479ee2565aba
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=294335761b75d13d374312d9074d1f9270f69267

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Merge from GitHub
  Update NEWS
  Fixed bug #65336

Conflicts:
NEWS

Bugs:
https://bugs.php.net/65336

Changed paths:
  MM  ext/opcache/ZendAccelerator.c
  MM  ext/opcache/ZendAccelerator.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c

2013-06-24 Thread Xinchen Hui 
Commit:d99a76ca965dac487b457a6599a4f42ba06ad033
Author:Xinchen Hui  Tue, 25 Jun 2013 13:48:54 
+0800
Parents:   d8374c5590370056cf2001e5a2f879ab9a3e77b0 
157ccaf507b7a94c43db4ec1b7321aac5cc68e8b
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d99a76ca965dac487b457a6599a4f42ba06ad033

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  ext/opcache/ZendAccelerator.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c

2013-06-24 Thread Dmitry Stogov 
Commit:0c9de2d94b490d6d1904d5f60082cd8523c006bf
Author:Dmitry Stogov  Mon, 24 Jun 2013 12:01:58 
+0400
Parents:   91cc70c43026efda88a73a321e2545858ca1b8b2 
f49b27e166739946c255924d6609d0a40a70783b
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0c9de2d94b490d6d1904d5f60082cd8523c006bf

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  OPcache must be compatible with LiteSpeed SAPI

Conflicts:
NEWS

Changed paths:
  MM  ext/opcache/ZendAccelerator.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c

2013-06-10 Thread Dmitry Stogov 
Commit:95d88cc66a79b3ee554bb8c2fc2f426c890aa2c6
Author:Dmitry Stogov  Mon, 10 Jun 2013 11:44:54 
+0400
Parents:   456ef2ebfa6d3765856bbe04dfeb953c352fe1e5 
23a9bb09baa504f20929c150b184b6c032cfc251
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=95d88cc66a79b3ee554bb8c2fc2f426c890aa2c6

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Avoid multiple allocations of the same key in different processes

Changed paths:
  MM  ext/opcache/ZendAccelerator.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c

2013-06-10 Thread Dmitry Stogov 
Commit:738dfc69e72d2d61229437767a89140094e40542
Author:Dmitry Stogov  Mon, 10 Jun 2013 12:06:14 
+0400
Parents:   95d88cc66a79b3ee554bb8c2fc2f426c890aa2c6 
53e6529203932b709a0925886b0997d91d682a12
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=738dfc69e72d2d61229437767a89140094e40542

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed comments

Changed paths:
  MM  ext/opcache/ZendAccelerator.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c

2013-06-10 Thread Dmitry Stogov 
Commit:456ef2ebfa6d3765856bbe04dfeb953c352fe1e5
Author:Dmitry Stogov  Mon, 10 Jun 2013 11:25:41 
+0400
Parents:   841e1f036456abc03e47f5733bf854d8e42a6a8d 
540488bf55746a36363c56462e939a56550e3717
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=456ef2ebfa6d3765856bbe04dfeb953c352fe1e5

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Compact HashTables before storing them in shared memory

Conflicts:
ext/opcache/ZendAccelerator.c

Changed paths:
  MM  ext/opcache/ZendAccelerator.c


Diff:
diff --cc ext/opcache/ZendAccelerator.c
index 9a6c763,212e1e6..4fa28d5
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -1126,10 -1126,10 +1126,14 @@@ static zend_persistent_script *cache_sc
return new_persistent_script;
}
  
 +  if (!zend_accel_script_optimize(new_persistent_script TSRMLS_CC)) {
 +  return new_persistent_script;
 +  }
 +
+   if (!compact_persistent_script(new_persistent_script)) {
+   return new_persistent_script;
+   }
+ 
/* exclusive lock */
zend_shared_alloc_lock(TSRMLS_C);


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