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

564 Commits

Author SHA1 Message Date
Nikita Popov 982f02afe6 Remove zend_dynamic_array
This was introduced back in 2000 to test a new hashtable
implementation and is no longer used.
2014-09-22 23:45:13 +02:00
Nikita Popov 02bb637bb8 Remove static allocator
We didn't even compile this file anymore
2014-09-22 23:45:13 +02:00
Florian MARGAINE 8eb7e7bf7f Merge branch 'master' into issue-67910
Conflicts:
	README.PARAMETER_PARSING_API
	ext/gmp/tests/001.phpt
2014-09-20 10:09:21 +02:00
Florian MARGAINE cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Anatol Belski 2700e248b8 add the missing src file 2014-09-20 01:43:05 +02:00
Johannes Schlüter d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski c030ff3e71 switch to using mbrlen with VS 2014-09-13 13:52:10 +02:00
Anatol Belski bc7833ddd2 switch to built-in atanh() on vs2013 and up 2014-09-01 15:45:55 +02:00
Anatol Belski 8a7d434025 fix acosh and asinh on win64 with vs2013+ 2014-09-01 14:21:53 +02:00
Lior Kaplan 56d02d564e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  typofixes
2014-08-17 15:51:15 +03:00
Lior Kaplan be2128c805 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  typofixes
2014-08-17 15:48:22 +03:00
Veres Lajos 3f42f2f5d1 typofixes 2014-08-17 15:44:02 +03:00
Xinchen Hui 235d0241d1 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-25 10:52:41 +08:00
Anatol Belski 6fcd8e5865 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix nmake snap when ext name is different in target dll
2014-07-21 14:46:57 +02:00
Anatol Belski dc3a5d783f fix nmake snap when ext name is different in target dll 2014-07-21 14:45:49 +02:00
Xinchen Hui 9bef96d96e Merge branch 'PHP-5.5' into PHP-5.6 2014-07-19 13:12:36 +08:00
Anatol Belski 982342b057 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  implemented copy libs of core exts in phpize mode
2014-07-18 18:40:09 +02:00
Anatol Belski c5ccaf1d04 implemented copy libs of core exts in phpize mode 2014-07-18 18:38:57 +02:00
Anatol Belski f304fb848f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix copy the ext dll into the prefix path in phpize mode
  fix default prefix in phpize mode
  fix file with zero size usage in phpize mode
2014-07-18 11:40:53 +02:00
Anatol Belski 35b077f53e fix copy the ext dll into the prefix path in phpize mode 2014-07-18 11:39:38 +02:00
Anatol Belski 8044d0680b fix default prefix in phpize mode 2014-07-18 11:36:44 +02:00
Anatol Belski a8e0a623ec fix file with zero size usage in phpize mode 2014-07-18 11:35:32 +02:00
Anatol Belski 0662a0b068 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  implemented usage of the non core ext deps in phpize mode
2014-07-17 21:49:08 +02:00
Anatol Belski b5324acd35 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  implemented usage of the non core ext deps in phpize mode
2014-07-17 21:48:46 +02:00
Anatol Belski f0a1e410a3 implemented usage of the non core ext deps in phpize mode 2014-07-17 21:47:15 +02:00
Anatol Belski 9308df4f62 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  implemented force usage of generated .h and .js deps in phpize mode
2014-07-17 09:32:31 +02:00
Anatol Belski 1a2c3bd3ad Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  implemented force usage of generated .h and .js deps in phpize mode
2014-07-17 09:26:46 +02:00
Anatol Belski b3c6089111 implemented force usage of generated .h and .js deps in phpize mode 2014-07-17 09:25:57 +02:00
Anatol Belski f86177c96f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  basic routines for phpize mode to
  This test depends on expose_php being on
  Test output relies on expose_php being on
  1.2 is a problematic float to print out Lower the default display precision for this test
  The test output is dependent on expose_php ini
2014-07-16 21:35:04 +02:00
Anatol Belski 7446c81aed Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  basic routines for phpize mode to
2014-07-16 21:34:19 +02:00
Anatol Belski ce2ad0df18 basic routines for phpize mode to
- generate headers for non core ext defines
- generate js deps for non core exts
2014-07-16 21:33:07 +02:00
Anatol Belski 41009b40e0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  added headers install to phpize mode
2014-07-14 09:53:34 +02:00
Anatol Belski 79b91e3c5a Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  added headers install to phpize mode
2014-07-14 09:53:16 +02:00
Anatol Belski 04821a1ee6 added headers install to phpize mode 2014-07-14 09:52:39 +02:00
Anatol Belski c79a6a0613 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix makefile in phpize mode
2014-07-11 15:07:22 +02:00
Anatol Belski b10ed89dac Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix makefile in phpize mode
2014-07-11 15:06:56 +02:00
Anatol Belski ae313b6037 fix makefile in phpize mode
- extend LDFLAGS with dynamically generated ones
- prevend dynamically generated CFLAGS to be overridden by hardcoded ones
2014-07-11 15:05:01 +02:00
Anatol Belski e0d6ed6b21 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixe output_as_table() when no ext was enabled
2014-07-11 09:38:44 +02:00
Anatol Belski f3d565f6ac Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fixe output_as_table() when no ext was enabled
2014-07-11 09:37:19 +02:00
Anatol Belski 9f5cf7d41a fixe output_as_table() when no ext was enabled 2014-07-11 09:36:44 +02:00
Anatol Belski 63abaa6d69 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix end of stream exception when generating makefile
2014-07-10 22:35:23 +02:00
Anatol Belski efcc789ef8 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix end of stream exception when generating makefile
2014-07-10 22:34:55 +02:00
Anatol Belski 02b661ecfc fix end of stream exception when generating makefile 2014-07-10 22:33:55 +02:00
Anatol Belski 552cfcc578 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  force ext_dep.js prepend to configure.js in phpize mode
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4

Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapilib.c
2014-07-10 22:03:45 +02:00
Anatol Belski cc67cf6322 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  force ext_dep.js prepend to configure.js in phpize mode
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4
2014-07-10 21:51:32 +02:00
Anatol Belski 1f90dd3359 force ext_dep.js prepend to configure.js in phpize mode 2014-07-10 21:50:37 +02:00
Anatol Belski 71f4b1e4d9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  turn off PGO in phpize mode
  Fixed typo in Makefile.frag
  Fixed typo in Makefile.frag
2014-07-10 19:37:12 +02:00
Anatol Belski ec6b367722 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  turn off PGO in phpize mode
  Fixed typo in Makefile.frag
2014-07-10 19:36:04 +02:00
Anatol Belski e2b0d97950 turn off PGO in phpize mode 2014-07-10 19:35:26 +02:00
Anatol Belski a8076b9312 explicitly PHP_ANALYZER=no when no known keyword was passed 2014-07-10 15:20:34 +02:00