date:20130417

[PHP-CVS] com php-src: updated lib versions: win32/build/libs_version.txt

2013-04-17 Thread Anatol Belski

Commit:323fdb9879c69c40ab7baa83400e182e292b547e
Author:Anatol Belski a...@php.net Wed, 17 Apr 2013 13:12:18 +0200
Parents:   a9271a8b0dd60c6e602e9f4e6fdfcd6fb0b66dc4
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

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

Log:
updated lib versions

Changed paths:
  M  win32/build/libs_version.txt


Diff:
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt
index b5d62ae..e3cdcd2 100644
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@ -1,17 +1,17 @@
-bz2-1.0.6
-cclient-2007e
-freetype-2.4.10
-icu-49.1.2
-jpeglib-8
-libcurl-7.29.0
-libiconv-1.14
-libmcrypt-2.5.8
-libmpir-1.3.1
-libpng-1.2.50
-libpq-8.3.6
-libssh2-1.4.2
-libtidy-20090325
-libxslt-1.1.27
-libxml-2.7.8
-openssl-0.9.8y
-
+bz2-1.0.6
+cclient-2007e
+freetype-2.4.10
+icu-49.1.2
+jpeglib-8
+libcurl-7.30.0
+libiconv-1.14
+libmcrypt-2.5.8
+libmpir-1.3.1
+libpng-1.2.50
+libpq-8.3.6
+libssh2-1.4.2
+libtidy-20090325
+libxslt-1.1.27
+libxml-2.7.8
+openssl-0.9.8y
+


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

[PHP-CVS] com php-src: updated lib versions: win32/build/libs_version.txt

2013-04-17 Thread Anatol Belski

Commit:fb955a613c92f78efe4c37dbaa8e4a3ce87b49e1
Author:Anatol Belski a...@php.net Wed, 17 Apr 2013 13:17:32 +0200
Parents:   4fbe1173ebeed2e250e91fa017f905064469c560
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
updated lib versions

Changed paths:
  M  win32/build/libs_version.txt


Diff:
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt
index 017561c..897d77b 100644
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@ -3,7 +3,7 @@ cclient-2007e
 freetype-2.4.3
 icu-49.1.2
 jpeglib-8
-libcurl-7.29.0
+libcurl-7.30.0
 libiconv-1.14
 libmcrypt-2.5.8
 libmpir-2.5.1


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

[PHP-CVS] com php-src: fixed EOL: win32/build/libs_version.txt

2013-04-17 Thread Anatol Belski

Commit:4fbe1173ebeed2e250e91fa017f905064469c560
Author:Anatol Belski a...@php.net Wed, 17 Apr 2013 13:15:08 +0200
Parents:   e694d409631d20ed9c8a8fb6f61ea1d9df1d7001
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
fixed EOL

Changed paths:
  M  win32/build/libs_version.txt


Diff:
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt
index decae8f..017561c 100644
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@ -1,16 +1,16 @@
-bz2-1.0.6
-cclient-2007e
-freetype-2.4.3
-icu-49.1.2
-jpeglib-8
-libcurl-7.29.0
-libiconv-1.14
-libmcrypt-2.5.8
-libmpir-2.5.1
-libpng-1.2.50
-libpq-8.3.6
-libssh2-1.4.2
-libtidy-20090325
-libxslt-1.1.27
-libxml-2.7.8
-openssl-0.9.8y
+bz2-1.0.6
+cclient-2007e
+freetype-2.4.3
+icu-49.1.2
+jpeglib-8
+libcurl-7.29.0
+libiconv-1.14
+libmcrypt-2.5.8
+libmpir-2.5.1
+libpng-1.2.50
+libpq-8.3.6
+libssh2-1.4.2
+libtidy-20090325
+libxslt-1.1.27
+libxml-2.7.8
+openssl-0.9.8y


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

[PHP-CVS] com php-src: updated lib versions: win32/build/libs_version.txt

2013-04-17 Thread Anatol Belski

Commit:ca425a67c439d4230356e90a9bcf5996c4d15e3a
Author:Anatol Belski a...@php.net Wed, 17 Apr 2013 13:20:23 +0200
Parents:   adc17bff57e36312d707641428f32ef53070dc5b
Branches:  PHP-5.5 master

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

Log:
updated lib versions

Changed paths:
  M  win32/build/libs_version.txt


Diff:
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt
index 3eb9f2a..81c2572 100644
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@ -6,8 +6,7 @@ icu-49.1.2
 icu-50.1.2
 jpeglib-8
 jpeglib-9
-libcurl-7.27.0
-libcurl-7.29.0
+libcurl-7.30.0
 libiconv-1.14
 libmcrypt-2.5.8
 libmpir-2.5.1


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

[PHP-CVS] com php-src: Added curl config test for windows: ext/curl/tests/check_win_config.phpt

2013-04-17 Thread Anatol Belski

Commit:2d9cbf720d55c7dde8ff96a099cff60c3c6995cd
Author:Anatol Belski a...@php.net Wed, 17 Apr 2013 14:25:45 +0200
Parents:   c76cdb806753b57d13d598c7752598f94254f120
Branches:  PHP-5.5 master

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

Log:
Added curl config test for windows

Changed paths:
  A  ext/curl/tests/check_win_config.phpt


Diff:
diff --git a/ext/curl/tests/check_win_config.phpt 
b/ext/curl/tests/check_win_config.phpt
new file mode 100644
index 000..103f1cf
--- /dev/null
+++ b/ext/curl/tests/check_win_config.phpt
@@ -0,0 +1,48 @@
+--TEST--
+Check libcurl config on windows
+--SKIPIF--
+?php 
+if (!extension_loaded(curl)) {
+   die('skip - curl extension not available in this build'); 
+}
+if(substr(PHP_OS, 0, 3) != 'WIN' )
+  die(skip for windows only);
+?
+--FILE--
+?php
+   ob_start();
+   phpinfo();
+   $s = ob_get_contents();
+   ob_end_clean();
+   preg_match('/curl\n\n(.+)\n\n/siU', $s, $m);
+
+   echo $m[1], \n;
+
+?
+DONE
+--EXPECTF--
+cURL support = enabled
+cURL Information = %s
+Age = %d
+Features
+AsynchDNS = Yes
+CharConv = No
+Debug = No
+GSS-Negotiate = Yes
+IDN = Yes
+IPv6 = Yes
+krb4 = No
+Largefile = Yes
+libz = Yes
+NTLM = Yes
+NTLMWB = No
+SPNEGO = Yes
+SSL = Yes
+SSPI = Yes
+TLS-SRP = No
+Protocols = dict, file, ftp, ftps, gopher, http, https, imap, imaps, ldap, 
pop3, pop3s, rtsp, scp, sftp, smtp, smtps, telnet, tftp
+Host = %s-pc-win32
+SSL Version = OpenSSL/%s
+ZLib Version = %s
+libSSH Version = libssh2/%s
+DONE


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

[PHP-CVS] com php-src: Initialize literals hash_value and cache_slot: ext/opcache/Optimizer/zend_optimizer.c

2013-04-17 Thread Dmitry Stogov

Commit:5a897009a83bba1a0f32982d7438d6967d1eddeb
Author:Dmitry Stogov dmi...@zend.com Wed, 17 Apr 2013 21:19:56 
+0400
Parents:   2d9cbf720d55c7dde8ff96a099cff60c3c6995cd
Branches:  PHP-5.5

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

Log:
Initialize literals hash_value and cache_slot

Changed paths:
  M  ext/opcache/Optimizer/zend_optimizer.c


Diff:
diff --git a/ext/opcache/Optimizer/zend_optimizer.c 
b/ext/opcache/Optimizer/zend_optimizer.c
index b574ecc..a6450ab 100644
--- a/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@ -33,20 +33,13 @@ int zend_optimizer_add_literal(zend_op_array *op_array, 
const zval *zv TSRMLS_DC
 {
int i = op_array-last_literal;
op_array-last_literal++;
-#if ZEND_EXTENSION_API_NO  PHP_5_3_X_API_NO
-   {
-   if (i = CG(context).literals_size) {
-   CG(context).literals_size += 16; /* FIXME */
-   op_array-literals = 
(zend_literal*)erealloc(op_array-literals, CG(context).literals_size * 
sizeof(zend_literal));
-   }
-   }
-#else
-   if (i = op_array-size_literal) {
-   op_array-size_literal += 16; /* FIXME */
-   op_array-literals = 
(zend_literal*)erealloc(op_array-literals, op_array-size_literal * 
sizeof(zend_literal));
+   if (i = CG(context).literals_size) {
+   CG(context).literals_size += 16; /* FIXME */
+   op_array-literals = 
(zend_literal*)erealloc(op_array-literals, CG(context).literals_size * 
sizeof(zend_literal));
}
-#endif
op_array-literals[i].constant = *zv;
+   op_array-literals[i].hash_value = 0;
+   op_array-literals[i].cache_slot = -1;
Z_SET_REFCOUNT(op_array-literals[i].constant, 2);
Z_SET_ISREF(op_array-literals[i].constant);
return i;


--
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/Optimizer/zend_optimizer.c

2013-04-17 Thread Dmitry Stogov

Commit:bc959fbafff50d4a7c88814097d992b7439da106
Author:Dmitry Stogov dmi...@zend.com Wed, 17 Apr 2013 21:27:19 
+0400
Parents:   cd3dc3308ba5ebc8abfb393a10011a1478048872 
5a897009a83bba1a0f32982d7438d6967d1eddeb
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Initialize literals hash_value and cache_slot

Conflicts:
ext/opcache/Optimizer/zend_optimizer.c

Changed paths:
  MM  ext/opcache/Optimizer/zend_optimizer.c


Diff:
diff --cc ext/opcache/Optimizer/zend_optimizer.c
index 92f5f4a,a6450ab..b2148e1
--- a/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@@ -64,8 -33,13 +64,10 @@@ int zend_optimizer_add_literal(zend_op_
  {
int i = op_array-last_literal;
op_array-last_literal++;
 -  if (i = CG(context).literals_size) {
 -  CG(context).literals_size += 16; /* FIXME */
 -  op_array-literals = 
(zend_literal*)erealloc(op_array-literals, CG(context).literals_size * 
sizeof(zend_literal));
 -  }
 +  op_array-literals = (zend_literal*)erealloc(op_array-literals, 
op_array-last_literal * sizeof(zend_literal));
op_array-literals[i].constant = *zv;
+   op_array-literals[i].hash_value = 0;
+   op_array-literals[i].cache_slot = -1;
Z_SET_REFCOUNT(op_array-literals[i].constant, 2);
Z_SET_ISREF(op_array-literals[i].constant);
return i;


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

[PHP-CVS] com php-src: updated lib versions: win32/build/libs_version.txt

[PHP-CVS] com php-src: updated lib versions: win32/build/libs_version.txt

[PHP-CVS] com php-src: fixed EOL: win32/build/libs_version.txt

[PHP-CVS] com php-src: updated lib versions: win32/build/libs_version.txt

[PHP-CVS] com php-src: Added curl config test for windows: ext/curl/tests/check_win_config.phpt

[PHP-CVS] com php-src: Initialize literals hash_value and cache_slot: ext/opcache/Optimizer/zend_optimizer.c

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

7 matches

Site Navigation

Mail list logo

Footer information