clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
87,315 Commits 491 Branches 1,363 Tags 841 MiB
29688512b4
Commit Graph

37258 Commits

Author SHA1 Message Date
Anatol Belski
29688512b4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
  PDO_MySQL: Differentiate between linux and win32 when passing unix_socket

Conflicts:
	ext/pdo_mysql/mysql_driver.c
 2015-01-15 17:51:43 +01:00
Anatol Belski
3d6a83a7d0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
 2015-01-15 17:48:11 +01:00
steffen
7c9633412e PDO_MySQL: Differentiate between linux and win32 when passing unix_socket 
Unix uses "127.0.0.1" as default host for named pipes,
while when using Windows a "." is required as host by mysqlnd.
(This can be seen at mysqlnd.c (line 945 or searching #ifndef PHP_WIN32)
 2015-01-15 16:42:51 +01:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Xinchen Hui
9aac41753b Save one condition 2015-01-15 18:41:25 +08:00
Xinchen Hui
11f615b311 We could do more.... 2015-01-15 04:29:01 -05:00
Xinchen Hui
2823c9dafb Fixed missed test 2015-01-15 01:17:58 -05:00
Xinchen Hui
e61f444268 Fixed tests on 32-bits 2015-01-15 14:23:47 +08:00
Xinchen Hui
b57dc41e07 Optimize array_unique to save some comparation calls 2015-01-15 13:57:06 +08:00
Xinchen Hui
8a0bc38535 Merge branch 'zend_sort' of https://github.com/laruence/php-src 2015-01-14 22:15:41 -05:00
Stanislav Malyshev
8d26c53f7c Fix bug #68816 - pointer to local outside of scope 2015-01-14 16:14:43 -08:00
Stanislav Malyshev
7f95aa4d97 Fix bug #68817: Null pointer deference 2015-01-14 16:12:35 -08:00
Dmitry Stogov
e0155d536f Avoid string reallocation in strtr() 2015-01-14 20:58:41 +03:00
Daniel Lowrey
80a337bba1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS
  Fixed bug #55618 (use case-insensitive cert name matching)
 2015-01-14 18:04:41 +01:00
Daniel Lowrey
e2fe8e164f Fixed bug #55618 (use case-insensitive cert name matching) 2015-01-14 18:02:50 +01:00
Dmitry Stogov
588e803e85 Ipmrove strtr() by maintaining a set of characters that may start a matched pattern and avoid zend_hash_find() calls for other paterns. 2015-01-14 15:04:04 +03:00
Xinchen Hui
2193de0d18 Faster sorting algo 2015-01-14 18:02:41 +08:00
Dmitry Stogov
ade7a41040 Optimized str_[i]replace to aviod reallocations and repeatable conversions to lowercase 2015-01-13 23:23:50 +03:00
Dmitry Stogov
7e93de101f Handle run-time cache for static properties directly in executor. 
Removed cache_slot argument in zend_std_get_static_property() and zend_std_unset_static_property().
 2015-01-13 09:33:15 +03:00
Dmitry Stogov
2387771daf Slight improvement in copying script from opcache SHM into process memory 2015-01-12 23:51:40 +03:00
Dmitry Stogov
a7ce679578 Fixed type (case sensetive/insensetive mess) 2015-01-12 22:30:55 +03:00
Dmitry Stogov
c5047d1f11 Use FAST_ZPP in few more frequently used functions 2015-01-12 19:26:12 +03:00
Anatol Belski
5f68ffad71 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68771 SQL syntax error in sqlite lib
 2015-01-12 17:03:00 +01:00
Anatol Belski
edb66e05db Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68771 SQL syntax error in sqlite lib
 2015-01-12 17:02:18 +01:00
Anatol Belski
ef58622534 Fixed bug #68771 SQL syntax error in sqlite lib 2015-01-12 16:55:47 +01:00
Dmitry Stogov
8d2a7e98db Added special optimized cases when strtr() called with zero or one search/replace pair. 2015-01-12 16:51:59 +03:00
Dmitry Stogov
b277d360e9 Fixed reference support 2015-01-12 14:43:32 +03:00
Xinchen Hui
2f1ddff2a5 Faster strrpos implementation 2015-01-12 17:24:37 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Bob Weinand
773c8b0c09 Fix missing ZVAL_DEREF() 2015-01-10 22:29:00 +01:00
Rasmus Lerdorf
16d779a833 Adding a note here for my future self so I won't 
need to look into this again
 2015-01-09 16:36:21 -08:00
Rasmus Lerdorf
deca940406 We can't output absolute S and T values for the 
Diophantine solution here since it can vary based
on the libgmp version we are linking against and
in general there are almost always multiple valid
solutions
 2015-01-09 16:27:09 -08:00
Rasmus Lerdorf
46f429f8e6 We can't output absolute S and T values for the 
Diophantine solution here since it can vary based
on the libgmp version we are linking against and
in general there are almost always multiple valid
solutions
 2015-01-09 16:23:50 -08:00
Rasmus Lerdorf
3b9057bc6f We can't output absolute S and T values for the 
Diophantine solution here since it can vary based
on the libgmp version we are linking against and
in general there are almost always multiple valid
solutions
 2015-01-09 16:16:47 -08:00
Julien Pauli
fb069be475 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS
  Fix bug #68260
 2015-01-09 16:25:14 +01:00
Julien Pauli
138b6442d4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #68260
 2015-01-09 16:24:32 +01:00
Julien Pauli
dc810543cf Fix bug #68260 2015-01-09 16:24:14 +01:00
krakjoe
b99dd1e895 Merge branch 'master' of git://git.php.net/php-src 2015-01-09 07:48:29 +00:00
krakjoe
159c331844 optimization for bug report #68679 2015-01-09 07:45:21 +00:00
Xinchen Hui
aa5b3b0e4a Merge branch 'PHP-5.6' 2015-01-09 11:54:01 +08:00
Xinchen Hui
0547edb5c2 Fixed bug (try block removed while combined with xdebug) 2015-01-09 11:53:47 +08:00
Dmitry Stogov
7b4808a647 Fixed bug #68636 (setlocale no longer returns current value per category). 2015-01-09 01:41:13 +03:00
Adam Harvey
ed8ebd6ce4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Calling crypt() with a salt of *0 should always return *1.

Conflicts:
	configure.in
	main/php_version.h
 2015-01-08 19:17:53 +00:00
Adam Harvey
16b6f6c7f4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Calling crypt() with a salt of *0 should always return *1.
  5.5.22 now

Conflicts:
	configure.in
	main/php_version.h
 2015-01-08 19:16:32 +00:00
Adam Harvey
8b0f105761 Calling crypt() with a salt of *0 should always return *1. 2015-01-08 19:13:23 +00:00
Anatol Belski
e383f05e2f Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test
 2015-01-08 18:11:46 +01:00
Anatol Belski
2e79820c0e fix test 2015-01-08 18:11:15 +01:00
Xinchen Hui
777c39f404 Fixed #68677 2015-01-08 16:32:20 +08:00