1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Commit Graph

84822 Commits

Author SHA1 Message Date
Anatol Belski f2e728616c fix signed/unsigned mismatch warnings 2014-09-17 00:56:38 +02:00
Dmitry Stogov 551ee4165b Use runtime-cache to avoid hash lookups in BIND_GLOBAL instruction 2014-09-17 00:52:45 +04:00
Dmitry Stogov c2decc6afc optimized colision list traverse 2014-09-17 00:52:03 +04:00
Anatol Belski 7ba43ea052 fix signed/unsigned mismatch 2014-09-16 22:15:27 +02:00
Anatol Belski 8c4ab0d02e fix signed/unsigned mismatch 2014-09-16 21:17:27 +02:00
Anatol Belski fc6f7bfcf3 fix signed/unsigned mismatch 2014-09-16 21:17:25 +02:00
Anatol Belski 5777aa51d9 fix signed/unsigned mismatch 2014-09-16 21:17:24 +02:00
Anatol Belski 65c401672e redo the fix with cast to size_t 2014-09-16 21:17:22 +02:00
Anatol Belski 95132bee40 redo the fix casting to size_t 2014-09-16 21:17:21 +02:00
Anatol Belski 49a6b485a0 redo the fix casting to size_t where applicable 2014-09-16 21:17:19 +02:00
Anatol Belski db24742f01 fixed type 2014-09-16 21:17:18 +02:00
Anatol Belski fba6e5a8cb fix signed/unsigned mismatch warnings 2014-09-16 21:17:16 +02:00
Anatol Belski 8240255e37 fixed signed/unsigned mismatch warning 2014-09-16 21:17:15 +02:00
Nikita Popov 543ae3f029 Drop BC alias HASH_NON_EXISTANT 2014-09-16 18:29:00 +02:00
Nikita Popov 311a67a2ed Remove HASH_NEXT_INSERT flag
We already pass ht->nNextFreeElement and the rest is handled by
ZEND_HASH_ADD.
2014-09-16 18:29:00 +02:00
Nikita Popov 0bf55b65d4 Remove two more always-true conditions 2014-09-16 18:28:59 +02:00
krakjoe 6967f78cc9 Merge branch 'pull-request/808' 2014-09-16 15:40:31 +01:00
Dmitry Stogov f469dc7429 Improve opcache.fast_shutdown 2014-09-16 15:28:46 +04:00
Anatol Belski 3329d54cd9 better error messages in ZMM on Windows 2014-09-16 12:27:25 +02:00
Dmitry Stogov 13be4a5a4b emalloc() must not return NULL 2014-09-16 13:53:26 +04:00
Dmitry Stogov ca37c02520 code optimization 2014-09-16 13:52:50 +04:00
Matteo Beccati 2508ce7aef Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed freetype test on multiple environments
2014-09-16 10:23:03 +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
Dmitry Stogov f5517d16d6 ws 2014-09-16 11:56:56 +04:00
Anatol Belski 71cc3991bf cast the other way round, the sign check is already done before 2014-09-16 09:33:02 +02:00
Xinchen Hui 6d2ca4b508 it's good for gc debuging 2014-09-16 14:15:01 +08:00
Dmitry Stogov d17487f827 We don't have to check for undefined CV if we fetch it for isset() operation 2014-09-16 09:15:47 +04:00
Nikita Popov 079409bbc2 Switch (un)mangle property name to size_t and zend_string
Also use the _ex variants where possible.
2014-09-16 00:31:27 +02:00
Dmitry Stogov 6991780793 Optimized FE_RESET and FE_FETCH 2014-09-16 01:34:27 +04:00
Nikita Popov a7bfd006bd Remove always-true comparisons 2014-09-15 23:07:31 +02:00
Nikita Popov ca43b99fc6 Update types in zend_hash
* String lengths are size_t
 * Indexes are uint32_t
 * Flags are uint32_t
 * Booleans are zend_bool
2014-09-15 23:07:31 +02:00
Anatol Belski 8b2f15551d fix signed/unsigned mismatch warnings 2014-09-15 19:46:33 +02:00
Anatol Belski 066d39020b fix types 2014-09-15 19:46:32 +02:00
Anatol Belski dc37e089e3 fix signed/unsigned mismatch 2014-09-15 19:46:31 +02:00
Anatol Belski e0ff5238c5 fix negating an unsigned 2014-09-15 19:46:30 +02:00
Anatol Belski 383a0773ff fix signed/unsigned mismatch 2014-09-15 19:46:29 +02:00
Anatol Belski e591c78d09 revamp serialization to work with size_t for Serializable 2014-09-15 19:46:28 +02:00
Anatol Belski 0799459e76 fix signed/unsigned mismatch 2014-09-15 19:46:26 +02:00
Anatol Belski e940fc268a fix signed/unsigned mismatch 2014-09-15 19:46:25 +02:00
Anatol Belski ea94210e8c fix most of signed/unsigned warnings in vm def 2014-09-15 19:46:24 +02:00
Remi Collet bfa8639219 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
2014-09-15 13:32:37 +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 172ca172d1 correct fix to the natcmp_ex
Till now the actualy length diff between the strings was under
circumstances returned. Whereby for a compare function only return
values of (1, 0, -1) make sense. Thus the old behavior isn't
present anymore, natcmp_ex now behaves as a standard compare function.
2014-09-15 12:58:46 +02:00
Anatol Belski 836fd73cce fix signed/unsigned mismatch 2014-09-15 12:58:45 +02:00
Anatol Belski c8ed0d81e7 fix signed/unsigned mismatch 2014-09-15 12:58:44 +02:00