mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 20:34:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
90,832 Commits 500 Branches 1,381 Tags 814 MiB
bc0df38e88
Commit Graph

90832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Piotrowski
bc0df38e88 Added more indirect call tests, remove invalid test 2015-06-25 19:46:28 -05:00
Aaron Piotrowski
ba67fc2218 Fix 'Class::method' indirect call with empty method name 2015-06-25 19:37:52 -05:00
Tjerk Meesters
03a670eaaa Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
 2015-06-26 06:03:29 +08:00
Tjerk Meesters
2ff3dafccf Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs 
Squashed commit of the following:

commit a64c1d9bc4
Author: Tomasz Sawicki <falundir@gmail.com>
Date:   Wed Jun 24 08:49:37 2015 +0200

    Fix #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs

    The "key values mismatch" error is triggered in openssl_pkcs12_read by
    PKCS12_parse, because it uses X509_check_private_key to separate main
    certificate (which corresponds to private key) from extra certificates.
    Extra certificates usually comes first (p12 contents are reversed as
    stack) and X509_check_private_key triggers X509_R_KEY_VALUES_MISMATCH
    error.
    The fix pops "key values mismatch" error from OpenSSL error stack for
    each extra certificate if there are any.
 2015-06-26 05:33:28 +08:00
Rasmus Lerdorf
7ceb47477d 3rd arg to stream_set_timeout is optional 
ignore_user_abort() should take a bool not a string
 2015-06-25 10:31:37 -07:00
Julien Pauli
20585beb76 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix unknown size of void error
 2015-06-25 19:13:49 +02:00
Julien Pauli
b1ec4515b0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix unknown size of void error
 2015-06-25 19:13:20 +02:00
Anatol Belski
80f9a9725c fix unknown size of void error 2015-06-25 19:12:26 +02:00
Dmitry Stogov
2a2f42c25d Optimize out usless conditions used by specializer 2015-06-25 18:56:14 +03:00
Anatol Belski
04b26ba5c6 update the doc in regard to the latest discussions 2015-06-25 16:39:02 +02:00
Anatol Belski
0955f9513f Merge branch 'PHP-5.6' 
* PHP-5.6:
  backport missing rev bfdc9e2805
 2015-06-25 11:35:11 +02:00
Anatol Belski
7bb52dda6a backport missing rev bfdc9e2805 2015-06-25 11:34:04 +02:00
Dmitry Stogov
f5fd58f737 Better check for __builtin_constant_p() availability 2015-06-25 12:02:28 +03:00
Dmitry Stogov
90976c9978 Moved test to correct place 2015-06-25 11:22:21 +03:00
Bob Weinand
f42cdf83b0 Fix paths issue when fetching .phpdbginit under Windows 2015-06-25 00:36:01 +02:00
Ferenc Kovacs
190478e9da Merge remote-tracking branch 'origin/PHP-5.6' 
* origin/PHP-5.6:
  5.6.12 next
 2015-06-25 00:23:21 +02:00
Ferenc Kovacs
1efe5b1157 5.6.12 next 2015-06-25 00:21:45 +02:00
Hannes Magnusson
4a6503a524 Typo (thanks kaplan@) 2015-06-24 08:24:11 -07:00
Xinchen Hui
2a9e012aa5 Merge branch 'master' of git.php.net:php-src 2015-06-24 21:44:31 +08:00
Xinchen Hui
fa61f921f9 Micro optimization 2015-06-24 21:42:54 +08:00
Bob Weinand
ab90e55b9e Passing a zend_string * to %s is a bad idea 2015-06-24 15:29:26 +02:00
Julien Pauli
2424b349ad Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.5.28 now - Security Only
 2015-06-24 10:45:42 +02:00
Julien Pauli
ca82114f21 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.5.28 now - Security Only

Conflicts:
	configure.in
	main/php_version.h
 2015-06-24 10:42:41 +02:00
Julien Pauli
8e440dc1d7 5.5.28 now - Security Only 2015-06-24 10:41:06 +02:00
Anatol Belski
e821a13a4d fix NEWS 2015-06-24 10:21:54 +02:00
Rasmus Lerdorf
1201be392f 3rd arg to define() is optional 2015-06-23 23:53:23 -04:00
Rasmus Lerdorf
56b0d6f3a0 Wrong arginfo on assert 
(not adding types, just fixing a missing arg)
 2015-06-23 22:41:41 -04:00
Hannes Magnusson
517196b065 PHP7 sounds like a good time to include signatures in announce mails 
We need these posted as many places as possible to make any sense.
 2015-06-23 19:33:37 -07:00
Hannes Magnusson
ce01d7361e space 2015-06-23 19:29:10 -07:00
Christoph M. Becker
d90763d4c6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Made bug44295-win.phpt locale independent
 2015-06-24 02:04:34 +02:00
Christoph M. Becker
c201b63873 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Made bug44295-win.phpt locale independent
 2015-06-24 01:42:22 +02:00
Christoph M. Becker
cd068b1ed6 Made bug44295-win.phpt locale independent 
Formerly it failed on non English installations.
 2015-06-24 01:41:33 +02:00
Christoph M. Becker
27e557a169 Merge branch 'master' of https://git.php.net/repository/php-src 
# By Rasmus Lerdorf (3) and others
# Via Rasmus Lerdorf
* 'master' of https://git.php.net/repository/php-src:
  Fix more proto comments
  prepare NEWS for next
  Fix more minor mistakes in the proto comments
  Avoid op_num = -1 in unfinished generator cleanup
  Fix incorrect protos
 2015-06-24 01:15:44 +02:00
Christoph M. Becker
7464424776 updated NEWS 2015-06-24 00:54:20 +02:00
Christoph M. Becker
00adcbd3e9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed bug #69768 (escapeshell*() doesn't cater to !)
  bump API version to 6.8
 2015-06-24 00:47:18 +02:00
Christoph M. Becker
e181931f77 updated NEWS 2015-06-24 00:42:24 +02:00
Christoph M. Becker
905c5f4858 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #69768 (escapeshell*() doesn't cater to !)
  bump API version to 6.8
 2015-06-24 00:32:13 +02:00
Christoph M. Becker
b03f743e7d updated NEWS 2015-06-24 00:31:07 +02:00
Christoph M. Becker
8da8dc04b6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #69768 (escapeshell*() doesn't cater to !)
  bump API version to 6.8
 2015-06-24 00:23:39 +02:00
Christoph M. Becker
921544cad9 updated NEWS 2015-06-24 00:20:32 +02:00
Christoph M. Becker
a621781fdb Fixed bug #69768 (escapeshell*() doesn't cater to !) 
When delayed variable substitution is enabled (can be set in the
Registry, for instance), !ENV! works similar to %ENV%, and so ! should
be escaped like %.
 2015-06-24 00:15:55 +02:00
Rasmus Lerdorf
28d7bb97a1 Fix more proto comments 2015-06-23 17:46:20 -04:00
Anatol Belski
2d2bd2db97 prepare NEWS for next 2015-06-23 22:26:11 +02:00
Rasmus Lerdorf
41774bceff Fix more minor mistakes in the proto comments 2015-06-23 15:47:33 -04:00
Nikita Popov
ea5c66ec93 Avoid op_num = -1 in unfinished generator cleanup 
Also add two tests showing that the -1 substraction in the
computation of op_num is really necessary.
 2015-06-23 20:17:30 +02:00
Rasmus Lerdorf
f4d08d8e5c Fix incorrect protos 2015-06-23 14:15:24 -04:00
Christoph M. Becker
e08d27d650 updated NEWS 2015-06-23 19:44:22 +02:00
Christoph M. Becker
ca049e0ae9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
 2015-06-23 19:41:02 +02:00
Christoph M. Becker
13347225ac updated NEWS 2015-06-23 19:36:59 +02:00
Christoph M. Becker
e1561c490e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
 2015-06-23 19:32:57 +02:00