php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
94,016 Commits 549 Branches 1,486 Tags
fd6ec7fcbee4d354dddc98a096d0abfc994be4e8
Commit Graph

94016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui fd6ec7fcbe Merge branch 'master' of git.php.net:/php-src 2016-01-06 00:03:37 +08:00
Anatol Belski 1963427738 Merge branch 'PHP-7.0' 
* PHP-7.0:
  improve fix for bug #71273
 2016-01-05 20:04:18 +01:00
Anatol Belski 1dc395c8c4 improve fix for bug #71273 2016-01-05 20:03:05 +01:00
Anatol Belski 89326f0df3 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
 2016-01-05 18:58:02 +01:00
Anatol Belski 8d630f7d15 update NEWS 2016-01-05 18:57:38 +01:00
Anatol Belski 1cc0b353b2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71273 A wrong ext directory setup in php.ini leads to crash
 2016-01-05 18:56:12 +01:00
Anatol Belski 9a07245b72 Fixed bug #71273 A wrong ext directory setup in php.ini leads to crash 2016-01-05 18:54:46 +01:00
Xinchen Hui 4550e93b78 Merge branch 'PHP-7.0' 2016-01-06 00:03:01 +08:00
Xinchen Hui ce2b2f7e0a Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2016-01-06 00:02:53 +08:00
George Wang 69112d7e97 Fixed runtime php.ini override, ini name length is off by 1. 
(cherry picked from commit 5bcb7a7019)
 2016-01-05 23:48:42 +02:00
Xinchen Hui 3d59a752af Merge branch 'PHP-7.0' 2016-01-06 00:01:56 +08:00
Xinchen Hui 695e8b79af Fixed bug #71287 (Error message contains hexadecimal instead of decimal number) 2016-01-06 00:01:44 +08:00
Andrey Hristov 37418deb02 Fix reloc for the allocator. Original files and lines were not showing 
correct. This seems to be a PHP7 issue.
 2016-01-05 16:29:22 +01:00
Bob Weinand 5034ec44ca Merge branch 'PHP-7.0' 2016-01-05 16:28:23 +01:00
Bob Weinand 654c8aedd1 Fixed bug #71275 (Bad method called on cloning an object having a trait) 2016-01-05 16:27:24 +01:00
Xinchen Hui 671987ce83 Merge branch 'PHP-7.0' 2016-01-05 23:02:55 +08:00
Xinchen Hui d4da32d312 Fixed bug #71280 (ibase_blob_add() expects parameter 2 to be resorce) 2016-01-05 23:02:17 +08:00
Andrey Hristov e64b845c89 Fix typo that was unhiding only with USE_ZEND_ALLOC 2016-01-05 13:19:32 +01:00
Julien Pauli 928d2cb3a4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Happy new year (Update copyright to 2016)
 2016-01-04 18:14:08 +01:00
Julien Pauli 736b91c650 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c
 2016-01-04 18:13:38 +01:00
Jakub Zelenka 9b95dd5e37 Merge branch 'PHP-7.0' 2016-01-04 16:53:30 +00:00
Jakub Zelenka 0ea63cb2a8 Fix small CS label issue in openssl.c 2016-01-04 16:52:52 +00:00
Dominic Luechinger e4bdf51f0a Replaced whitespaces with tabs and fixed aligments 2016-01-04 16:46:32 +00:00
Andrey Hristov a19173e4af - Make functions static, as they are not needed to be public - exported 
through a structure
- Fixed typo in statistic name
- Added 2 static functions for copying a MYSQLND_CSTRING and converting
  a CSTRING to STRING.
 2016-01-04 16:48:35 +01:00
Xinchen Hui c1b73ff8af Merge branch 'PHP-7.0' 2016-01-04 05:39:20 -08:00
Xinchen Hui 36b4311edd Do not edit the value in place (might be relates to #71261) 2016-01-04 05:38:15 -08:00
Xinchen Hui 1265c82b1c Merge branch 'PHP-7.0' 2016-01-03 14:23:06 +08:00
Xinchen Hui 919562d53b Fixed bug #71264 (file_put_contents() returns unexpected value when filesystem runs full) 2016-01-03 14:21:23 +08:00
Xinchen Hui d0e3ce73f0 Merge branch 'PHP-7.0' 2016-01-03 14:07:13 +08:00
Xinchen Hui bce7ed1859 Duplicated i 2016-01-03 14:06:52 +08:00
Lior Kaplan 53fb2f1e5c Happy new year (Update copyright to 2016) 2016-01-03 01:44:37 +02:00
Anatol Belski fe99f02437 Merge branch 'PHP-7.0' 
* PHP-7.0:
  remove duplicated skipif conditions
 2016-01-02 13:59:13 +01:00
Anatol Belski 302a35bb15 remove duplicated skipif conditions 2016-01-02 13:56:56 +01:00
Xinchen Hui 563659822d Merge branch 'PHP-7.0' 2016-01-02 17:56:54 +08:00
Xinchen Hui 97a9470d97 bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
Xinchen Hui 6a7001ed72 Merge branch 'PHP-5.6' into PHP-7.0 2016-01-02 17:53:01 +08:00
Xinchen Hui 3537e95dae bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
Xinchen Hui d9bac84220 Merge branch 'PHP-5.6' of https://github.com/kaplanlior/php-src into PHP-5.6 2016-01-02 17:48:20 +08:00
Anatol Belski caf007cdd6 Merge branch 'PHP-7.0' 
* PHP-7.0:
  sync with new tests from 7.0 for ICU 55_1 and 56_1 compat
  sync skipifs for ext/intl for ICU 55_* and 56_* compat
 2016-01-01 20:28:02 +01:00
Anatol Belski 2c6a4445f7 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  sync with new tests from 7.0 for ICU 55_1 and 56_1 compat
  sync skipifs for ext/intl for ICU 55_* and 56_* compat
 2016-01-01 20:27:23 +01:00
Anatol Belski a7b1ea3c84 sync with new tests from 7.0 for ICU 55_1 and 56_1 compat 2016-01-01 20:25:36 +01:00
Anatol Belski 6bcf4b4f40 sync skipifs for ext/intl for ICU 55_* and 56_* compat 2016-01-01 20:13:35 +01:00
Lior Kaplan 71c1980025 Happy new year (Update copyright to 2016) 2016-01-01 20:06:12 +02:00
Lior Kaplan 3d5438bf7b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update header to PHP Version 7
  Happy new year (Update copyright to 2016)
  Happy new year (Update copyright to 2016)
 2016-01-01 20:04:31 +02:00
Lior Kaplan 59a7ef914f Update header to PHP Version 7 2016-01-01 20:03:16 +02:00
Lior Kaplan 2eb1f38d24 Happy new year (Update copyright to 2016) 2016-01-01 20:03:16 +02:00
Lior Kaplan ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan c51e73c803 Happy new year (Update copyright to 2016) 2016-01-01 19:23:04 +02:00
Lior Kaplan 49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Xinchen Hui 91e899b489 Merge branch 'PHP-7.0' 2016-01-01 07:07:29 -08:00