[Phpmyadmin-git] [phpmyadmin/phpmyadmin] db178d: Avoid hardcoded time limit in SHP import

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: db178d62c273f0a7a15a26ae992ed8f7e2159373
      https://github.com/phpmyadmin/phpmyadmin/commit/db178d62c273f0a7a15a26ae992ed8f7e2159373
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-09-16 (Mon, 16 Sep 2013)

  Changed paths:
    M libraries/plugins/import/ImportShp.class.php

  Log Message:
  -----------
  Avoid hardcoded time limit in SHP import


  Commit: 72ba7b62a8b82f99e349ed809176718e3276a2f9
      https://github.com/phpmyadmin/phpmyadmin/commit/72ba7b62a8b82f99e349ed809176718e3276a2f9
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-09-16 (Mon, 16 Sep 2013)

  Changed paths:
    M test/travis.php.ini

  Log Message:
  -----------
  Revert "Increase time limits for tests on Travis"

This reverts commit 63e71c6e152d310aff389a23e92c34756a1698d5.

The original limit is big enough, we just harcoded it in SHP importer.


  Commit: 3fef046acf30a2e2eaca65b1e2a839e353c464b3
      https://github.com/phpmyadmin/phpmyadmin/commit/3fef046acf30a2e2eaca65b1e2a839e353c464b3
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-09-16 (Mon, 16 Sep 2013)

  Changed paths:
    M libraries/plugins/import/ImportShp.class.php

  Log Message:
  -----------
  Do not set memory limit in SHP import as well

- First of all current detection is wrong and it will fail on values as
  65536K.
- Also I see no reason why single import should override global settings
  we have.


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/63e71c6e152d...3fef046acf30