date:20130314

[PHP-CVS] com php-src: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5: Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-03-14 Thread Dmitry Stogov

Commit:dd1c358d1bf8fd492e39d46f93878d47a3b6d257
Author:Dmitry Stogov dmi...@zend.com Thu, 14 Mar 2013 14:19:41 
+0400
Parents:   d77c865aff794826f6286c078268db6a005fea33 
c09652c2899dd4149fe3187b5b50f6b3c54da384
Branches:  PHP-5.5 master

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

Log:
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  fix the fix
  fix for bug  #63530   mysqlnd_stmt::bind_one_parameter uses wrong alloc for 
stmt-param_bind
  Forgot to remove some now unused variables
  Add support for non-scalar Iterator keys in foreach
  fixed headers order
  - Updated to version 2013.2 (2013b)
  fixed the test
  Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])
  Disable zend_always_inline in debug build

Bugs:
https://bugs.php.net/63530
https://bugs.php.net/64370

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: Removed redundand code: Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-03-14 Thread Dmitry Stogov

Commit:d77c865aff794826f6286c078268db6a005fea33
Author:Dmitry Stogov dmi...@zend.com Wed, 13 Mar 2013 17:51:10 
+0400
Parents:   c7ad92fac72a11efcfa9b70cb19d9feae87936d6
Branches:  PHP-5.5 master

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

Log:
Removed redundand code

Changed paths:
  M  Zend/zend_vm_def.h
  M  Zend/zend_vm_execute.h

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 578a319..b7445c9 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2839,17 +2839,17 @@ ZEND_VM_HANDLER(62, ZEND_RETURN, CONST|TMP|VAR|CV, ANY)
if (OP1_TYPE == IS_TMP_VAR) {
FREE_OP1();
}
-   } else if (!IS_OP1_TMP_FREE()) { /* Not a temp var */
-   if (*EG(return_value_ptr_ptr)) {
-   zval_ptr_dtor(EG(return_value_ptr_ptr));
-   }
+   } else {
if (OP1_TYPE == IS_CONST ||
-   (PZVAL_IS_REF(retval_ptr)  Z_REFCOUNT_P(retval_ptr)  0)) 
{
+   OP1_TYPE == IS_TMP_VAR ||
+   PZVAL_IS_REF(retval_ptr)) {
zval *ret;
 
ALLOC_ZVAL(ret);
INIT_PZVAL_COPY(ret, retval_ptr);
-   zval_copy_ctor(ret);
+   if (OP1_TYPE != IS_TMP_VAR) {
+   zval_copy_ctor(ret);
+   }
*EG(return_value_ptr_ptr) = ret;
} else if ((OP1_TYPE == IS_CV || OP1_TYPE == IS_VAR) 
   retval_ptr == EG(uninitialized_zval)) {
@@ -2861,16 +2861,6 @@ ZEND_VM_HANDLER(62, ZEND_RETURN, CONST|TMP|VAR|CV, ANY)
*EG(return_value_ptr_ptr) = retval_ptr;
Z_ADDREF_P(retval_ptr);
}
-   } else {
-   zval *ret;
-
-   if (*EG(return_value_ptr_ptr)) {
-   zval_ptr_dtor(EG(return_value_ptr_ptr));
-   }
-
-   ALLOC_ZVAL(ret);
-   INIT_PZVAL_COPY(ret, retval_ptr);
-   *EG(return_value_ptr_ptr) = ret;
}
FREE_OP1_IF_VAR();
ZEND_VM_DISPATCH_TO_HELPER(zend_leave_helper);
@@ -2886,10 +2876,6 @@ ZEND_VM_HANDLER(111, ZEND_RETURN_BY_REF, 
CONST|TMP|VAR|CV, ANY)
SAVE_OPLINE();
 
do {
-   if (EG(return_value_ptr_ptr)  *EG(return_value_ptr_ptr)) {
-   zval_ptr_dtor(EG(return_value_ptr_ptr));
-   }
-
if (OP1_TYPE == IS_CONST || OP1_TYPE == IS_TMP_VAR) {
/* Not supposed to happen, but we'll allow it */
zend_error(E_NOTICE, Only variable references should 
be returned by reference);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 3925696..ddbc39d 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2333,17 +2333,17 @@ static int ZEND_FASTCALL  
ZEND_RETURN_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
if (IS_CONST == IS_TMP_VAR) {
 
}
-   } else if (!0) { /* Not a temp var */
-   if (*EG(return_value_ptr_ptr)) {
-   zval_ptr_dtor(EG(return_value_ptr_ptr));
-   }
+   } else {
if (IS_CONST == IS_CONST ||
-   (PZVAL_IS_REF(retval_ptr)  Z_REFCOUNT_P(retval_ptr)  0)) 
{
+   IS_CONST == IS_TMP_VAR ||
+   PZVAL_IS_REF(retval_ptr)) {
zval *ret;
 
ALLOC_ZVAL(ret);
INIT_PZVAL_COPY(ret, retval_ptr);
-   zval_copy_ctor(ret);
+   if (IS_CONST != IS_TMP_VAR) {
+   zval_copy_ctor(ret);
+   }
*EG(return_value_ptr_ptr) = ret;
} else if ((IS_CONST == IS_CV || IS_CONST == IS_VAR) 
   retval_ptr == EG(uninitialized_zval)) {
@@ -2355,16 +2355,6 @@ static int ZEND_FASTCALL  
ZEND_RETURN_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
*EG(return_value_ptr_ptr) = retval_ptr;
Z_ADDREF_P(retval_ptr);
}
-   } else {
-   zval *ret;
-
-   if (*EG(return_value_ptr_ptr)) {
-   zval_ptr_dtor(EG(return_value_ptr_ptr));
-   }
-
-   ALLOC_ZVAL(ret);
-   INIT_PZVAL_COPY(ret, retval_ptr);
-   *EG(return_value_ptr_ptr) = ret;
}
 
return zend_leave_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
@@ -2380,10 +2370,6 @@ static int ZEND_FASTCALL  
ZEND_RETURN_BY_REF_SPEC_CONST_HANDLER(ZEND_OPCODE_HAND
SAVE_OPLINE();
 
do {
-   if (EG(return_value_ptr_ptr)  *EG(return_value_ptr_ptr)) {
-   zval_ptr_dtor(EG(return_value_ptr_ptr));
-   }
-

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-03-14 Thread Dmitry Stogov

Commit:22b0f5d82904cf1da3b0b2515670e272f4798139
Author:Dmitry Stogov dmi...@zend.com Thu, 14 Mar 2013 14:22:51 
+0400
Parents:   37664354e532263ad35c137cc3a4c6a5bf9c4455 
dd1c358d1bf8fd492e39d46f93878d47a3b6d257
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Removed redundand code

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: fix zts check: ext/pcre/php_pcre.c

2013-03-14 Thread Anatol Belski

Commit:e43c5a83957c6a9953a74b5403a5f1d5ae341770
Author:Anatol Belski a...@php.net Thu, 14 Mar 2013 14:38:20 +0100
Parents:   f1e2edff8befb7863723adbe5680ce3d9714d9ed
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

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

Log:
fix zts check

Changed paths:
  M  ext/pcre/php_pcre.c


Diff:
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index cab3a4c..fe72dbc 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -250,7 +250,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(char 
*regex, int regex_le
pcre_cache_entry new_entry;
 
 #if HAVE_SETLOCALE
-# ifdef PHP_WIN32  ZTS
+# if defined(PHP_WIN32)  defined(ZTS)
_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
 # endif
locale = setlocale(LC_CTYPE, NULL);


--
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.3' into PHP-5.4: ext/pcre/php_pcre.c

2013-03-14 Thread Anatol Belski

Commit:5df8cf19759c77ee05fe6eecba7088caecbe132e
Author:Anatol Belski a...@php.net Thu, 14 Mar 2013 14:39:09 +0100
Parents:   0777a18703d9be2ea8efd85c0352863b8768e49e 
e43c5a83957c6a9953a74b5403a5f1d5ae341770
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix zts check

Changed paths:
  MM  ext/pcre/php_pcre.c


Diff:
diff --cc ext/pcre/php_pcre.c
index 20fb2a2,fe72dbc..0d5d505
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@@ -248,10 -248,9 +248,10 @@@ PHPAPI pcre_cache_entry* pcre_get_compi
  #endif
pcre_cache_entry*pce;
pcre_cache_entry new_entry;
 +  char*tmp = NULL;
  
  #if HAVE_SETLOCALE
- # ifdef PHP_WIN32  ZTS
+ # if defined(PHP_WIN32)  defined(ZTS)
_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
  # endif
locale = setlocale(LC_CTYPE, NULL);


--
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.4' into PHP-5.5: ext/pcre/php_pcre.c

2013-03-14 Thread Anatol Belski

Commit:96388c78c978101a84dc2ccc8b02948f0fb5999f
Author:Anatol Belski a...@php.net Thu, 14 Mar 2013 14:39:47 +0100
Parents:   dd1c358d1bf8fd492e39d46f93878d47a3b6d257 
5df8cf19759c77ee05fe6eecba7088caecbe132e
Branches:  PHP-5.5 master

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

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix zts check

Changed paths:
  MM  ext/pcre/php_pcre.c


Diff:



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

[PHP-CVS] tag php-src: create tag php-5.3.23

2013-03-14 Thread Johannes Schlüter

Tag php-5.3.23 in php-src.git was created
Tag: 35841ff0fc33b046bd8a3cad0e7342b25059469b
Tagger:  Johannes Schlüterjohan...@php.net Thu Mar 14 18:15:30 
2013 +0100
Log:
PHP 5.3.23
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.17 (SunOS)

iQEcBAABAgAGBQJRQgXIAAoJEH3sTmn8nIPXCD8H/jYonmeZjzODmLhkpEmgc+3G
6N+dME8UAPzB1P3IDnyD/GmoYp1IY5FqVKFtELfFylJOJsyRhQFnZ83QFjIGmu5O
vp0+S7zRXXButnafsy3QvoCNybPBG4Df4y4CK1t6G2pQ5L3132aWmjOD6zlD1Zjr
sp+SbNvPbsQ/bj7QOj9nbI2dqvlP2yA2g3DAD726YOZ3re7Fq33jBW8w14nrW/f5
buA7Gb0Fr04Mx9fYkBNfgcwFrGnk3TDkmHo+zws7VK+qTU8da/ax09bW6PM/FAu8
VwpD19uP/HR1XoHVd1o3bIPeJURziAd2KzjpzJlgEnWfdUwctNj1Ghjw5/YS99k=
=7QP1
-END PGP SIGNATURE-

Link: 
http://git.php.net/?p=php-src.git;a=tag;h=35841ff0fc33b046bd8a3cad0e7342b25059469b

Target:  575aeb37d0f4ce2b5ba9157884a19b8270ae07e3
Author:  Johannes Schlüter johan...@php.net Thu, 14 Mar 2013 
18:07:03 +0100
Parents: 8f533d2dfd1f029b5d1a811fdeac753a4dc0a7a2
Target link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=575aeb37d0f4ce2b5ba9157884a19b8270ae07e3
Target log:
PHP 5.3.23

Changed paths:
  M  NEWS
  M  configure.in
  M  main/php_version.h



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

[PHP-CVS] com php-src: PHP 5.3.23: NEWS configure.in main/php_version.h

2013-03-14 Thread Johannes Schlüter

Commit:575aeb37d0f4ce2b5ba9157884a19b8270ae07e3
Author:Johannes Schlüter johan...@php.net Thu, 14 Mar 2013 
18:07:03 +0100
Parents:   8f533d2dfd1f029b5d1a811fdeac753a4dc0a7a2
Branches:  PHP-5.3.23

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

Log:
PHP 5.3.23

Changed paths:
  M  NEWS
  M  configure.in
  M  main/php_version.h


Diff:
diff --git a/NEWS b/NEWS
index 5f19e6d..a03138a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 PHPNEWS
 |||
-28 Feb 2013, PHP 5.3.23RC1
+14 Mar 2013, PHP 5.3.23
+
+- SOAP
+  . Improved check that soap.wsdl_cache_dir conforms to open_basedir (Dmitry)
+  . Disabled external entities loading. (Dmitry)
 
 - SPL:
   . Fixed bug #64264 (SPLFixedArray toArray problem). (Laruence)
diff --git a/configure.in b/configure.in
index c461df2..3cc0be5 100644
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h)
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=3
 PHP_RELEASE_VERSION=23
-PHP_EXTRA_VERSION=RC1
+PHP_EXTRA_VERSION=
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 
diff --git a/main/php_version.h b/main/php_version.h
index 3add96c..978e39d 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 3
 #define PHP_RELEASE_VERSION 23
-#define PHP_EXTRA_VERSION RC1
-#define PHP_VERSION 5.3.23RC1
+#define PHP_EXTRA_VERSION 
+#define PHP_VERSION 5.3.23
 #define PHP_VERSION_ID 50323


--
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' of git.php.net:php-src into PHP-5.5: Zend/zend_vm_def.h Zend/zend_vm_execute.h

[PHP-CVS] com php-src: Removed redundand code: Zend/zend_vm_def.h Zend/zend_vm_execute.h

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

[PHP-CVS] com php-src: fix zts check: ext/pcre/php_pcre.c

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/pcre/php_pcre.c

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/pcre/php_pcre.c

[PHP-CVS] tag php-src: create tag php-5.3.23

[PHP-CVS] com php-src: PHP 5.3.23: NEWS configure.in main/php_version.h

8 matches

Site Navigation

Mail list logo

Footer information