php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
80,312 Commits 549 Branches 1,485 Tags
b465f00d42dbe170e9eb905fe1dcbdbf4ce1f945
Commit Graph

80312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev b465f00d42 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix date
  update NEWS
  Revert xp_ssl.c to the state of 5.4.32 due to regressions
 2014-09-26 01:01:39 -07:00
Stanislav Malyshev 00e99dcafd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
  Revert xp_ssl.c to the state of 5.4.32 due to regressions

Conflicts:
	ext/openssl/xp_ssl.c
 2014-09-26 01:00:20 -07:00
Stanislav Malyshev 2bfe92c90f fix date 2014-09-26 00:56:39 -07:00
Stanislav Malyshev 28ed0119ac update NEWS 2014-09-26 00:55:49 -07:00
Stanislav Malyshev 408b172017 Revert xp_ssl.c to the state of 5.4.32 due to regressions 2014-09-26 00:44:24 -07:00
Remi Collet d19356948a NEWS 2014-09-26 09:07:12 +02:00
Remi Collet 97cab239d7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed bug #68103 Dupplicate entry in Reflection
 2014-09-26 09:06:51 +02:00
Remi Collet bf046d6d66 NEWS 2014-09-26 09:06:12 +02:00
Remi Collet efa7f87de4 Fixed bug #68103 Dupplicate entry in Reflection 
$ php -r '$r=new ReflectionExtension("pthreads"); print_r($r->getClassNames());'
Array
(
    [0] => Threaded
    [1] => stackable
    [2] => Thread
    [3] => Worker
    [4] => Mutex
    [5] => Cond
    [6] => Collectable
    [7] => Pool
)

In getClasses() output, it is possible to compare key (ex "stackable")
with $obj->name (ex "Threaded") to detect class alias.

...
    [Threaded] => ReflectionClass Object
        (
            [name] => Threaded
        )
    [stackable] => ReflectionClass Object
        (
            [name] => Threaded
        )
...
 2014-09-26 08:56:42 +02:00
Ferenc Kovacs d27f3e7b64 update the certificate used for the test, as it expired recently 2014-09-24 13:40:52 +02:00
Remi Collet 44921ca75d typo 2014-09-24 10:42:20 +02:00
Remi Collet 8d2de21b1c NEWS 2014-09-24 10:36:29 +02:00
Remi Collet 0d776ef87b Fix bug #68074 Allow to use system cipher list instead of hardcoded value 2014-09-24 10:34:55 +02:00
Ferenc Kovacs 213d9ee62d the order of the blocks should be Core, then exts in alphabetical order 2014-09-24 09:40:52 +02:00
Ferenc Kovacs 8673394ecc add missing NEWS entry for the phpdbg compilation fix 2014-09-24 09:39:14 +02:00
Ferenc Kovacs 60dda65306 add NEWS entry for #68088 2014-09-24 09:09:34 +02:00
Tjerk Meesters 1765548bce PR 837: Fixed typo in php.ini-development and php.ini-production 
Fixed typo in comment for 'mbstring.detect_order'
 2014-09-23 18:10:32 +08:00
Sebastian Zartner 876792c756 Fixed typo 2014-09-23 07:45:03 +02:00
Ard Biesheuvel 8312836c74 Merge branch 'PHP-5.5' into PHP-5.6 2014-09-20 16:42:12 -07:00
Ard Biesheuvel 7958793342 Merge branch 'PHP-5.4' into PHP-5.5 2014-09-20 16:40:02 -07:00
Ard Biesheuvel e64da8c20d Fixed bug #66242 (don't assume char is signed) 
This fixes a bug in libmagic where a cast to 'char' is assumed to result
in sign extension to occur. However, unqualified 'char' is unsigned on
architectures such as ARM, so the cast needs to be to 'signed char'
explicitly.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 2014-09-20 16:39:48 -07:00
Nikita Popov 308c0a727e Merge branch 'PHP-5.5' into PHP-5.6 2014-09-20 21:47:59 +02:00
Nikita Popov 5e977e69e1 Fixed bug #67633 2014-09-20 21:46:25 +02:00
Anatol Belski 6213d9fc91 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix possible array underflow
 2014-09-19 20:13:46 +02:00
Anatol Belski 5d9403f56c fix possible array underflow 
there are multiple issues with this code

- php_stream_read() returns an unsigned val, so is >= 0
- if it read less than sizeof(a) bytes, the function operates on garbage
- result->channels is an unsigned val, so >= 0
 2014-09-19 20:12:24 +02:00
Matteo Beccati 24ed330a22 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed freetype test on multiple environments
 2014-09-16 10:22:49 +02:00
Matteo Beccati b8470e19e4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed freetype test on multiple environments
 2014-09-16 10:22:34 +02:00
Matteo Beccati 00525b824a Fixed freetype test on multiple environments 
Some environments, apparently regardless to the freetype version, output 155, while others 156. I guess we can accept both ;)

This reverts commit 592df89027.
 2014-09-16 10:19:29 +02:00
Remi Collet a410067d78 NEWS 2014-09-15 13:32:13 +02:00
Remi Collet 47bc380ecf Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
 2014-09-15 13:31:26 +02:00
Remi Collet ad0b63cad4 NEWS 2014-09-15 13:31:17 +02:00
Remi Collet 8cac75969e Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache 
ProxyPass is unable to provide correct PATH_INFO
as it is not aware of file path (while SetHandler is).

As we can extract PATH_INFO from PATH_TRANSLATED,
we also need to check if present in SCRIPT_NAME
and remove it.

After applying this patch.
With mod_php
_SERVER["REQUEST_URI"]     /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"]     /info.php
_SERVER["PATH_INFO"]       /foor/bar
_SERVER["PHP_SELF"]        /info.php/foo/bar
_SERVER["QUERY_STRING"]    q=1

With mod_proxy_fcgi + SetHandler
_SERVER["REQUEST_URI"]     /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"]     /info.php
_SERVER["PATH_INFO"]       /foo/bar
_SERVER["PHP_SELF"]        /info.php/foo/bar
_SERVER["QUERY_STRING"]    q=1

With mod_proxy_fcgi + ProxyPass
_SERVER["REQUEST_URI"]     /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"]     /info.php
_SERVER["PATH_INFO"]       /foo/bar
_SERVER["PHP_SELF"]        /info.php/foo/bar
_SERVER["QUERY_STRING"]    q=1
 2014-09-15 13:29:55 +02:00
Anatol Belski 7f0f04e606 updated NEWS 2014-09-15 10:29:00 +02:00
Anatol Belski e8780e27fd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
 2014-09-15 10:28:22 +02:00
Anatol Belski 24b41a23b3 updated NEWS 2014-09-15 10:27:52 +02:00
Remi Collet a390d579bb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8
  Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8
 2014-09-15 08:24:20 +02:00
Remi Collet 6dc6daf7e3 Fix NEWS 
- #65641 mod_proxy-fcgi is not fixed (still open)
- #67606 mod_fastcgi is fixed in ee275e34c8
 2014-09-15 08:24:10 +02:00
Remi Collet 3411fe33a2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8
 2014-09-15 08:23:40 +02:00
Remi Collet 2775dc2b44 Fix NEWS 
- #65641 mod_proxy-fcgi is not fixed (still open)
- #67606 mod_fastcgi is fixed in ee275e34c8
 2014-09-15 08:23:25 +02:00
Bob Weinand 0cb365fb98 Merge phpdbg into PHP-5.6 2014-09-15 05:48:09 +02:00
Bob Weinand 05c73757ed Fix bug #111 (compile error without ZEND_SIGNALS) 2014-09-14 12:24:56 +02:00
Anatol Belski bcdbd47117 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed the cast and incompatible pointer warning
 2014-09-12 14:36:54 +02:00
Anatol Belski fdfc31a4f7 fixed the cast and incompatible pointer warning 2014-09-12 14:36:00 +02:00
Anatol Belski 13280a9e36 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
 2014-09-11 23:31:16 +02:00
Anatol Belski 69ea7f9509 reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0 2014-09-11 23:30:01 +02:00
Julien Pauli 8ff79d3e89 5.6.2 now 2014-09-11 18:37:25 +02:00
Anatol Belski 0b89bb83ba Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix precision when fetching float through mysqlnd
 2014-09-10 19:31:59 +02:00
Anatol Belski dff820cea3 fix precision when fetching float through mysqlnd 
fixes failing ext/mysqli/tests/010.phpt
 2014-09-10 19:29:11 +02:00
Bob Weinand 6464b3ffae Don't run travis against master (phpng) 2014-09-10 15:57:05 +02:00
Michael Wallner 4f2563329b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  make LTP version check a blacklist
 2014-09-10 13:31:22 +02:00