php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-30 03:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
78,224 Commits 549 Branches 1,487 Tags
e4f1eee6c30209737684f5953a8f3ff2afdbe414
Commit Graph

78224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yasuo Ohgaki e4f1eee6c3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added pg_lo_truncate() and 64bit large object support from PostgreSQL 9.3 and up
 2014-01-15 14:39:56 +09:00
Yasuo Ohgaki 28be6aea9c Added pg_lo_truncate() and 64bit large object support from PostgreSQL 9.3 and up 2014-01-15 14:37:24 +09:00
Yasuo Ohgaki a92c5b14cf Merge branch 'PHP-5.6' 
* PHP-5.6:
  Always initialize pg_version() result array elements to prevent failed test with older postgresql servers. Add missing client_encoding element.
 2014-01-15 14:28:08 +09:00
Yasuo Ohgaki c58329fccc Always initialize pg_version() result array elements to prevent failed test with older postgresql servers. Add missing client_encoding element. 2014-01-15 14:27:33 +09:00
Yasuo Ohgaki ee4e5ce2cf Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed pg_version() crash with older postgresql
 2014-01-15 13:32:43 +09:00
Yasuo Ohgaki d0924c2500 Fixed pg_version() crash with older postgresql 2014-01-15 13:32:15 +09:00
Yasuo Ohgaki 42c134df4b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1
 2014-01-15 11:07:51 +09:00
Yasuo Ohgaki 167eaedcbd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1
 2014-01-15 11:07:10 +09:00
Yasuo Ohgaki f52c251f60 Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1 2014-01-15 11:06:06 +09:00
Xinchen Hui aca07343ce Merge branch 'PHP-5.6' 2014-01-14 22:34:53 +08:00
Nikita Popov a5ee337156 Fixed arguments unpacking segfault with opcache 2014-01-14 22:34:08 +08:00
Anatol Belski 25e57e702b fix uninitialized value 2014-01-14 09:47:27 +01:00
Yasuo Ohgaki 681e1a5ce0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Made pg_version() return full connection info.
 2014-01-14 10:16:43 +09:00
Yasuo Ohgaki 58dff7cee5 Made pg_version() return full connection info. 2014-01-14 10:10:48 +09:00
Paul Tarjan d599d36d49 Dont ignore errors from FT_Get_Glyph 2014-01-13 16:30:48 -08:00
Andrey Hristov bbc37e78e8 Merge branch 'master' of git.php.net:php-src 2014-01-14 01:32:36 +02:00
Andrey Hristov 73008bb5ce More refactoring of the big function generating execute requests 2014-01-14 01:31:16 +02:00
Dmitry Stogov 5980e987d2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed ZTS build
 2014-01-13 23:11:36 +04:00
Dmitry Stogov 029d019dac Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed ZTS build
 2014-01-13 23:10:35 +04:00
Dmitry Stogov 9c32d30020 Fixed ZTS build 2014-01-13 23:09:59 +04:00
Anatol Belski de137e5a8d Merge branch 'PHP-5.6' 
* PHP-5.6:
  forked test for win32
 2014-01-13 17:13:11 +01:00
Anatol Belski 9b2dc009b2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  forked test for win32
 2014-01-13 17:12:53 +01:00
Anatol Belski 8092de3ca3 forked test for win32 2014-01-13 17:12:14 +01:00
Dmitry Stogov 127eb33b84 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
 2014-01-13 18:07:26 +04:00
Dmitry Stogov 7864fcaec9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)

Conflicts:
	NEWS
 2014-01-13 18:06:49 +04:00
Dmitry Stogov ce2f024e9f Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0) 2014-01-13 18:05:21 +04:00
Dmitry Stogov e141592da6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)
 2014-01-13 16:16:57 +04:00
Dmitry Stogov 9b74dc4a07 Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls) 2014-01-13 16:16:23 +04:00
Dmitry Stogov f5182741a6 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  move common code into a function
 2014-01-13 15:36:37 +04:00
Dmitry Stogov 3458dac342 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66471 (Keep backward compatibility)
 2014-01-13 15:36:06 +04:00
Dmitry Stogov ca550248f1 Fixed bug #66471 (Keep backward compatibility) 2014-01-13 15:34:25 +04:00
Andrey Hristov cf9966671c Merge branch 'master' of git.php.net:php-src 2014-01-13 12:40:59 +02:00
Andrey Hristov 01d5e28057 move common code into a function 2014-01-13 12:40:39 +02:00
Dmitry Stogov aab2e8eb7e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
 2014-01-13 12:08:23 +04:00
Dmitry Stogov d09d64c15c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)

Conflicts:
	NEWS
 2014-01-13 12:07:50 +04:00
Dmitry Stogov fcd75690fe Fixed bug #66474 (Optimizer bug in constant string to boolean conversion) 2014-01-13 12:06:19 +04:00
Bob Weinand a86e869ee8 Merge branch 'PHP-5.6' 2014-01-12 02:00:37 +01:00
Bob Weinand 69edad213a Fixed build (making zend_is_by_ref_func_arg_fetch function static) 2014-01-12 01:59:22 +01:00
Nikita Popov 4facc35413 Merge branch 'PHP-5.6' 2014-01-11 12:54:08 +01:00
Nikita Popov 2c47dfbaeb Implement argument unpacking 
RFC: https://wiki.php.net/rfc/argument_unpacking
 2014-01-11 12:42:08 +01:00
Nikita Popov c7bb283338 Minor cleanup in zend_do_pass_param() 2014-01-11 12:40:16 +01:00
Johannes Schlüter 82dfe1acc8 Merge branch 'PHP-5.6' 2014-01-10 16:04:29 +01:00
Johannes Schlüter 45d46d7edd Merge branch 'PHP-5.5' into PHP-5.6 2014-01-10 16:02:46 +01:00
Johannes Schlüter 98e06a10d3 fix encoding 2014-01-10 15:57:40 +01:00
Julien Pauli 277895717c 5.5.9-dev now 2014-01-10 10:01:30 +01:00
Anatol Belski 9aaea81cfe Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed EOL in the test
 2014-01-09 15:29:16 +01:00
Anatol Belski ec89e6bfe2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed EOL in the test
 2014-01-09 15:28:47 +01:00
Anatol Belski 4f115c0b7d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed EOL in the test
 2014-01-09 15:28:09 +01:00
Anatol Belski b8774519e2 fixed EOL in the test 2014-01-09 15:27:26 +01:00
Anatol Belski 3572a0482d Merge branch 'PHP-5.6' 
* PHP-5.6:
  added testcase from bug #65371
 2014-01-09 15:25:18 +01:00