php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 03:03:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
85,119 Commits 549 Branches 1,486 Tags
2fd7d60ea06aa07b99dc219655be7ab42b7e2e16
Commit Graph

85119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Wang 2fd7d60ea0 Merge branch 'master' of git.php.net:php-src 2014-10-03 16:43:58 -04:00
George Wang a7d2747890 Fixed a bug that causes crash when environment variable is access while parsing php.ini 2014-10-03 16:42:42 -04:00
Anatol Belski e9b2340151 fix asinh delivering -0 when the arg is 0 2014-10-03 22:18:21 +02:00
Nikita Popov b68886f7b5 Mark test for full GC root buffer as XFAIL 2014-10-03 22:02:02 +02:00
Nikita Popov 4e33f40445 Fix two date tests 
New behavior seems much more reasonable - nothing should be able
to touch the $this value like that.
 2014-10-03 22:02:02 +02:00
Nikita Popov 5831cca957 Mark three foreach tests as XFAIL 
A lot of work is needed to properly handle all foreach edge cases,
which is not going to happen anytime soon. So marking these tests
as XFAIL for now.
 2014-10-03 22:02:02 +02:00
Anatol Belski d2161c8104 reveal some newer libcurl features in MINFO 2014-10-03 21:47:00 +02:00
Nikita Popov c6b982a55d Merge branch 'PHP-5.6' 2014-10-03 21:42:35 +02:00
Nikita Popov 56da3638c4 Merge branch 'PHP-5.5' into PHP-5.6 2014-10-03 21:42:28 +02:00
Nikita Popov d67c05bb89 Fix bug number 2014-10-03 21:41:58 +02:00
Nikita Popov 443374675e Merge branch 'PHP-5.6' 
Conflicts:
	Zend/zend_object_handlers.c
 2014-10-03 21:30:06 +02:00
Nikita Popov 8617f2fa8d Merge branch 'PHP-5.5' into PHP-5.6 2014-10-03 21:27:07 +02:00
Nikita Popov 93288d0095 Fix bug #68188 2014-10-03 21:26:39 +02:00
Nikita Popov e7623f470f Fix bug #68133 and bug #68135 2014-10-03 21:06:26 +02:00
Anatol Belski 1ff094deb4 remove the remains of dsp files handling 2014-10-03 19:38:40 +02:00
Anatol Belski ea5f6eaf19 fix EX usage 2014-10-03 19:23:34 +02:00
Anatol Belski 647ebe6bf2 remove misprint parentheses 2014-10-03 19:23:33 +02:00
Anatol Belski 55c6737b73 remove misprint parentheses 2014-10-03 19:23:32 +02:00
Dmitry Stogov bd9a234645 Replaced EG(This) and EX(object) with EX(This). 
Internal functions now recieves zend_execute_data as the first argument.
 2014-10-03 19:32:46 +04:00
Xinchen Hui 5e39d0c19c And this one... 2014-10-03 19:07:02 +08:00
Xinchen Hui aa5f937958 It should be in extern c 2014-10-03 18:35:57 +08:00
Xinchen Hui f54f5368e4 Merge branch 'master' of https://git.php.net/repository/php-src 2014-10-03 18:35:18 +08:00
Xinchen Hui 54bad8bf57 Remove useless condition 2014-10-03 18:35:05 +08:00
Ferenc Kovacs e13e305b93 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS entry for previous commit
  NEWS entry for previous commit
  add IPv6 support to php-fpm
 2014-10-03 11:40:05 +02:00
Ferenc Kovacs 79e05bf557 NEWS entry for previous commit 2014-10-03 11:39:53 +02:00
Ferenc Kovacs 200e407b24 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS entry for previous commit
  add IPv6 support to php-fpm
 2014-10-03 11:39:09 +02:00
Ferenc Kovacs 25e65a7599 NEWS entry for previous commit 2014-10-03 11:38:32 +02:00
Robin Gloster 15ba757a2b add IPv6 support to php-fpm 2014-10-03 11:35:27 +02:00
Dmitry Stogov 5c63a4f72b Micro optimization for the most frequency case 2014-10-03 12:18:15 +04:00
Sara Golemon 1fab968a90 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add hash to EXTENSIONS file
 2014-10-02 18:55:39 -07:00
Sara Golemon f41a7b926a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add hash to EXTENSIONS file
 2014-10-02 18:55:29 -07:00
Sara Golemon 2cf94189a2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add hash to EXTENSIONS file
 2014-10-02 18:55:14 -07:00
Sara Golemon 4e7b31a0db Add hash to EXTENSIONS file 2014-10-02 18:54:46 -07:00
Johannes Schlüter 1721bbedab Remove extensions which are long gone 2014-10-03 02:12:09 +02:00
Ferenc Kovacs 26c5143a7f Merge branch 'PHP-5.6' 
* PHP-5.6:
  we also have xz release tarballs since 5.5
  5.5.19 now
 2014-10-02 22:33:10 +02:00
Ferenc Kovacs 7a529790b2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  we also have xz release tarballs since 5.5
  5.5.19 now

Conflicts:
	configure.in
	main/php_version.h
 2014-10-02 22:32:18 +02:00
Ferenc Kovacs d7b01aff89 we also have xz release tarballs since 5.5 2014-10-02 22:28:19 +02:00
Nikita Popov 51c90e999f Fix ZTS build 2014-10-02 21:58:29 +02:00
Anatol Belski c41fbcfb4c improved file size computation in stat() 
On 32 bit it's still overwlowing, so nothing is changed there. But
the usage of LARGE_INTEGER instead of bit shifting is a better way
to go.
 2014-10-02 12:18:02 +02:00
Dmitry Stogov ccb24caa6d Fixed incorrect compilation 2014-10-02 13:37:44 +04:00
Julien Pauli cfe8a8b968 5.5.19 now 2014-10-01 16:16:05 +02:00
Dmitry Stogov c4419e7a5b Expose zend_throw_exception_internal() 2014-10-01 16:37:21 +04:00
Dmitry Stogov 8857af8494 Use inline finction for OBJ_RELEASE() macro 2014-10-01 16:35:56 +04:00
Ferenc Kovacs d1cfc0b899 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS about the release date of 5.6.1
 2014-10-01 11:16:40 +02:00
Ferenc Kovacs 26f4e40622 update NEWS about the release date of 5.6.1 2014-10-01 11:15:59 +02:00
Remi Collet 26a5627cc6 only no_NO.ISO-8859-1 have to be ignored (merged) 2014-10-01 10:15:13 +02:00
Remi Collet 3e6f176733 only no_NO.ISO-8859-1 have to be ignored 2014-10-01 10:14:14 +02:00
krakjoe 7cbd8f8b8a remove bogus locale use from test 2014-10-01 10:12:06 +02:00
Remi Collet bd8d73ff45 Merge branch 'PHP-5.6' 
* PHP-5.6:
  use $PHP_LIBDIR instread of "lib" in skel example
 2014-10-01 09:27:18 +02:00
Remi Collet f584b67eaa Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  use $PHP_LIBDIR instread of "lib" in skel example
 2014-10-01 09:26:46 +02:00